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

[automerger skipped] Merge "Revert "Remove framework code that has moved to frameworks/libs/net"" am: 5c4b6301 am: 288fdeb4 am: ccd47538 -s ours
am skip reason: skipped by user taylori

Change-Id: If1e7e8719516855f6ad77afdb472ed96c2d0703e