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

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();
+                        }
                     }
                 }
             }