Merge "Passpoint: set FQDN and provider name for Passpoint AP in WifiInfo"