Merge "Add ability to show/hide different device information."

tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java

@@ -69,10 +69,16 @@ public class DeviceModelPreferenceControllerTest {
     }
 
     @Test
-    public void isAlwaysAvailable() {
+    public void isAvailable_returnTrueIfVisible() {
         assertThat(mController.isAvailable()).isTrue();
     }
 
+    @Test
+    @Config(qualifiers = "mcc999")
+    public void isAvailable_returnFalseIfNotVisible() {
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
     @Test
     public void displayPref_shouldSetSummary() {
         mController.displayPreference(mPreferenceScreen);