Follow up to "Add modified API to send more information to VrCore"

Fixes corner case when the same component name first shows up as a
non VR activity, then again as VR.

Bug: 63709047
Test: Device launched to VR Home
Change-Id: I6f590185635cde06b0fba9f0e05ff6d6d586cfbb

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

@@ -779,7 +779,8 @@ public class VrManagerService extends SystemService implements EnabledComponentC
             }
 
             if ((calling != null || mPersistentVrModeEnabled)
-                    && !Objects.equals(calling, mCurrentVrModeComponent)) {
+                    && !Objects.equals(calling, mCurrentVrModeComponent)
+                    || mRunning2dInVr != running2dInVr) {
                 sendUpdatedCaller = true;
             }
             mCurrentVrModeComponent = calling;