[automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 0122cf102f am: 2deb148476 am: f331b80dec -s ours
am skip reason: skipped by user huangaaron Change-Id: I7f5c1c3a41a779512658008fafe108b1e99182ec
This commit is contained in: