[automerger skipped] Merge "Remove framework code that has moved to frameworks/libs/net" am: 7cadca43f2 -s ours am: d408049007 -s ours
am skip reason: Change-Id I067cdc404e5a63947c19cb75069a39ae42faa3c8 with SHA-1 83659ec7a8 is in history

Change-Id: I97618fd4abcd989ed3d39bc538c53a2031a0904b
tree: c68032b65ad0dc4fdfd9204efa26d22e56c1a20d
  1. framework/
  2. OsuLogin/
  3. OWNERS