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

Change-Id: Ib0f483fd452313b42e289d24efc63bcec56036a0