[automerger skipped] Merge "NetworkKey: migrate from ScanResult.wifiSsid to SSID" am: 1124e240c0 am: c4df6668bb
am: 02076c7a01 -s ours
am skip reason: change_id Ic689e12b8de4af52fae26c25bc90c8eb093ad3fe with SHA1 1cdbf62f44 is in history

Change-Id: I8d9d8edd81db1f6183c2d44b4b6f9f024ccdbfff