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

Merge "[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" into rvc-d1-dev-plus-aosp am: 79274cab -s ours
am skip reason: Change-Id Ieb8927f9af7f87a5ae038bd6c7daeb3d70117fef with SHA-1 94df39ac is in history

Change-Id: I6a6cce701d7fa33cc08e5a3a6a6b3282ca59f853