Merge "Remove framework code that has moved to frameworks/libs/net" into stage-aosp-master
tree: d686929dfc8dedb581c6b01d1fa2edd4d0afc296
  1. framework/
  2. OsuLogin/
  3. OWNERS