[automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" into stage-aosp-master am: 20ec1aa166 -s ours
am skip reason: Change-Id I067cdc404e5a63947c19cb75069a39ae42faa3c8 with SHA-1 83659ec7a8 is in history

Change-Id: I6afee768cfb41be207641fb58adcd762e02d9a12
tree: 6954a3a33c76020ee1bd7d7d759049bb62342c72
  1. framework/
  2. OsuLogin/
  3. OWNERS