Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages"

src/com/android/settings/SettingsDumpService.java

...pplications/appinfo/AppDataUsagePreferenceController.java

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

...ndroid/settings/datausage/DataUsageSummaryPreference.java

...tings/datausage/DataUsageSummaryPreferenceController.java

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

...s/datausage/WifiDataUsageSummaryPreferenceController.java

src/com/android/settings/datausage/lib/DataUsageLib.java

...com/android/settings/network/NetworkProviderSettings.java

src/com/android/settings/wifi/WifiSettings.java

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

...m/android/settings/datausage/DataUsagePreferenceTest.java

...droid/settings/datausage/DataUsageInfoControllerTest.java

...id/settings/datausage/DataUsageSummaryPreferenceTest.java