Merge "WiFiInstaller: update usage of WifiManager#addOrUpdatePasspointConfiguration" am: 8ca5dd86cd
am: 67344dd5e0

Change-Id: I217d6147b893cbc5635f44469cb7a87cf09d9ffd