Merge "Fix test failure due to hanging layout" into sc-v2-dev am: 6d71d15808

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15881105

Change-Id: Ic6003447049f2d277e879bb5bbd2965022072719

services/core/java/com/android/server/wm/WindowStateAnimator.java

@@ -250,10 +250,10 @@ class WindowStateAnimator {
             // away.
             if (mLastHidden && mDrawState != NO_SURFACE && !forceApplyNow) {
                 mPostDrawTransaction.merge(postDrawTransaction);
-                layoutNeeded = true;
             } else {
                 mWin.getSyncTransaction().merge(postDrawTransaction);
             }
+            layoutNeeded = true;
         }
 
         return layoutNeeded;