Merge "NetworkKey: migrate from ScanResult.wifiSsid to SSID" am: 4a50ed2fc0
am: d36e86aece

Change-Id: I6e50821d3fdd5e6ff5fc4cd238ccd186dd1ff94c
tree: af5dd811acaebfdc4e1f8a4e831c3ac37772dbf8
  1. framework/
  2. OsuLogin/
  3. OWNERS