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

[automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" into stage-aosp-master am: aa078c03 -s ours am: d77972a3 -s ours
am skip reason: Change-Id Ieb8927f9af7f87a5ae038bd6c7daeb3d70117fef with SHA-1 94df39ac is in history

Change-Id: I6321cdaaea7b1e2a6ad0d4534eb548eeb27b9316