Merge "Revert "Remove framework code that has moved to frameworks/libs/net"" am: fd68903323 am: 432301edf5

Change-Id: I82f49f1256bd5f81049d8b6f224ef507e63a48fb
tree: 673a9f7cb442e783c888fab9ad3768a9d9877f50
  1. framework/
  2. OsuLogin/
  3. OWNERS