Merge "wifi: WifiManager API change for supporting Passpoint Release 2"