Merge "wifi: WifiManager API change for supporting Passpoint Release 2" am: 81505817 am: 358fe50e am: afc65709 Change-Id: If5b97a53b453c6ee347ce4667b3bcba4ee24dd9e