Merge commit '11324dcedfd9d4cccba0b1e493c44fe80bb05da4' into manual_merge_11324dcedf

Change-Id: Icd2605fd1572dd21bb27a7d42bc62ba9b06bd9ad

src/com/android/settings/datausage/DataUsageMeteredSettings.java

@@ -114,7 +114,8 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme
     }
 
     private Preference buildWifiPref(WifiConfiguration config) {
-        final String networkId = config.SSID;
+        final String networkId = config.isPasspoint() ?
+                config.providerFriendlyName : config.SSID;
         final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(networkId);
         final MeteredPreference pref = new MeteredPreference(getPrefContext(), template);
         pref.setTitle(removeDoubleQuotes(networkId));