Merge "WifiInstaller: use updated PasspointConfiguration APIs" am: b2d845283e am: a16a3cf067
am: 5bfa2c140a

Change-Id: I73a31b5f47f792e86ed1893b679c85146947f5bc