Merge "Create new SurfaceControl.Transaction when old closed" into udc-dev am: 2f1dc4bd06

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

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

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

@@ -248,7 +248,10 @@ class BLASTSyncEngine {
                     Slog.e(TAG, "WM sent Transaction to organized, but never received" +
                            " commit callback. Application ANR likely to follow.");
                     Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
-                    onCommitted(merged);
+                    synchronized (mWm.mGlobalLock) {
+                        onCommitted(merged.mNativeObject != 0
+                                ? merged : mWm.mTransactionFactory.get());
+                    }
                 }
             };
             CommitCallback callback = new CommitCallback();