Merge "Update metered string" into pi-dev

res/values/arrays.xml

@@ -1070,7 +1070,7 @@
     </string-array>
 
     <string-array name="wifi_metered_entries">
-        <item>Use network preference</item>
+        <item>Detect automatically</item>
         <item>Treat as metered</item>
         <item>Treat as unmetered</item>
     </string-array>

tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java

@@ -81,6 +81,6 @@ public class WifiMeteredPreferenceControllerTest {
 
         mPreferenceController.updateState(mDropDownPreference);
 
-        assertThat(mDropDownPreference.getEntry()).isEqualTo("Use network preference");
+        assertThat(mDropDownPreference.getEntry()).isEqualTo("Detect automatically");
     }
 }