Merge "WiFiInstaller: Passpoint API rename update" am: 22e03c839c am: ce206f5db4
am: 5440429b39

Change-Id: I2a775659005d73d2879269bc4e4e2c395171444a