Merge "Avoid extra force-relayout for sync" into tm-qpr-dev am: 51041e3cec

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

Change-Id: I80a9f3c7659a6d14eb2ceeb30ed923c89c08948c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -6043,6 +6043,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
         if (mRedrawForSyncReported) {
             return false;
         }
+        if (mInRelayout) {
+            // The last sync seq id will return to the client, so there is no need to request the
+            // client to redraw.
+            return false;
+        }
         return useBLASTSync();
     }