Merge "WiFiInstaller: update usage of WifiManager#addOrUpdatePasspointConfiguration" am: 8ca5dd86cd am: 67344dd5e0
am: 0cf6dffdbe  -s ours

Change-Id: Idd696986f906e9a8d390ced1f116171bac656c50