Merge "Add carrier ID field for WifiConfiguration and PasspointConfiguration"