Merge "Deprecate WifiManager passpoint API's"