Merge "Set WifiInfo Passpoint fields to null if not a Passpoint network"