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