Merge "wifi: hotspot2: add Passpoint APIs to WifiManager" am: 0295d7bd38
am: 5451f8279e

Change-Id: Ide84930e6d76e9e52716a5b31df31998b95a8a76