Merge "WiFiInstaller: update usage of WifiManager#addOrUpdatePasspointConfiguration"