Merge "Dismiss immersive mode overlay while in VR mode." into nyc-dev

services/core/java/com/android/server/policy/ImmersiveModeConfirmation.java

@@ -380,6 +380,10 @@ public class ImmersiveModeConfirmation {
         @Override
         public void onVrStateChanged(boolean enabled) throws RemoteException {
             mVrModeEnabled = enabled;
+            if (mVrModeEnabled) {
+                mHandler.removeMessages(H.SHOW);
+                mHandler.sendEmptyMessage(H.HIDE);
+            }
         }
     };
 }