[automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: ea79b2ec19 -s ours am: b63a992b5d -s ours

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

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