Merge "Correctly remove drag surface when perform drag failed" into udc-qpr-dev am: b67b54fc63

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

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

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

@@ -181,7 +181,11 @@ class DragDropController {
                     }
                 } finally {
                     if (surface != null) {
-                        surface.release();
+                        try (final SurfaceControl.Transaction transaction =
+                                mService.mTransactionFactory.get()) {
+                            transaction.remove(surface);
+                            transaction.apply();
+                        }
                     }
                 }
             }