Merge "Added Passpoint prefix to Passpoint related methods in WifiInfo"