Merge "Fix flaky WindowTokenClientControllerTest" into main

core/java/android/window/WindowTokenClientController.java

@@ -73,6 +73,12 @@ public class WindowTokenClientController {
         }
     }
 
+    /** Creates a new instance for test only. */
+    @VisibleForTesting
+    public static WindowTokenClientController createInstanceForTesting() {
+        return new WindowTokenClientController();
+    }
+
     private WindowTokenClientController() {}
 
     /**

core/tests/coretests/src/android/window/WindowTokenClientControllerTest.java

@@ -76,7 +76,7 @@ public class WindowTokenClientControllerTest {
         mOriginalWindowManagerService = WindowManagerGlobal.getWindowManagerService();
         WindowManagerGlobal.overrideWindowManagerServiceForTesting(mWindowManagerService);
         doReturn(mClientToken).when(mWindowTokenClient).asBinder();
-        mController = spy(WindowTokenClientController.getInstance());
+        mController = spy(WindowTokenClientController.createInstanceForTesting());
     }
 
     @After