Merge changes from topic "presubmit-am-b14a56dfc63a4a75a36aa0dcff9f1332" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Fix StatusBar test 2p: 68afc54a39
  Fix StatusBar test

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java

@@ -351,6 +351,10 @@ public class StatusBarTest extends SysuiTestCase {
         when(mStatusBarComponentFactory.create()).thenReturn(mStatusBarComponent);
         when(mStatusBarComponent.getNotificationShadeWindowViewController()).thenReturn(
                 mNotificationShadeWindowViewController);
+        doAnswer(invocation -> {
+            ((Runnable) invocation.getArgument(0)).run();
+            return null;
+        }).when(mNotificationShadeWindowController).batchApplyWindowLayoutParams(any());
 
         mShadeController = new ShadeControllerImpl(mCommandQueue,
                 mStatusBarStateController, mNotificationShadeWindowController,