[automerger skipped] Merge "Remove framework code that has moved to...

[automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 7cadca43 -s ours am: a9c9399e -s ours am: 4e5d167f -s ours am: 05b2d809 -s ours am: 720f88a8 -s ours
am skip reason: Change-Id Ieb8927f9af7f87a5ae038bd6c7daeb3d70117fef with SHA-1 94df39ac is in history

Change-Id: I9af8303f2d83f310c09516812edd3a5c8a74a596