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

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

Change-Id: I88ef318934572883b59615bd6a1644a5f658842b
tree: d686929dfc8dedb581c6b01d1fa2edd4d0afc296
  1. framework/
  2. OsuLogin/
  3. OWNERS