Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev

am: 34b2389fcf

Change-Id: I90669fbeed47a0f75e4f113a155cd54ab681a3c8

services/core/java/com/android/server/vr/VrManagerService.java

@@ -1125,8 +1125,8 @@ public class VrManagerService extends SystemService implements EnabledComponentC
     private void setPersistentVrModeEnabled(boolean enabled) {
         synchronized(mLock) {
             setPersistentModeAndNotifyListenersLocked(enabled);
-            // Disabling persistent mode when not showing a VR should disable the overall vr mode.
-            if (!enabled && mCurrentVrModeComponent == null) {
+            // Disabling persistent mode should disable the overall vr mode.
+            if (!enabled) {
                 setVrMode(false, null, 0, -1, null);
             }
         }