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

Change-Id: Ie84c8b17dd7b0392475f62b4f0199b7af04764a9