Merge "NetworkKey: migrate from ScanResult.wifiSsid to SSID"