Merge "Add null check for vrManager" into pi-dev

tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java

@@ -81,6 +81,12 @@ public class BrightnessLevelPreferenceControllerTest {
         assertThat(mController.isAvailable()).isTrue();
     }
 
+    @Test
+    public void isInVrMode_noVrManager_shouldAlwaysReturnFalse() {
+        doReturn(null).when(mController).safeGetVrManager();
+        assertThat(mController.isInVrMode()).isFalse();
+    }
+
     @Test
     public void onStart_shouldRegisterObserver() {
         BrightnessLevelPreferenceController controller =