Merge "WifiInstaller: Passpoint configuration API update" am: 26cfd49791
am: af736f1c66

Change-Id: Ibf515e5e059a54764442b57d0c07e5ce25993e11