[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 skip reason: Change-Id Ieb8927f9af7f87a5ae038bd6c7daeb3d70117fef with SHA-1 94df39ac is in history

Change-Id: I7797a366bbc7a94e8093e6812b6449d34c42f901