Merge "Passpoint: add FQDN and Provider name field in WifiInfo"