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

[automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: ea79b2ec -s ours am: b7df3d85 -s ours am: 8a376d96 -s ours am: 51721d1b -s ours

am skip reason: Change-Id Ibf2f370c97a602f186e37ea9ffbe177dd2ee0f1c with SHA-1 a8846356 is in history

Change-Id: If7e58a625357e360cbbc9d661aae4c25f088638e