Merge "wifi: hotspot2: add Passpoint APIs to WifiManager"