Merge "Fix issue with both shell and launcher updating drag surface" into tm-qpr-dev

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragLayout.java

@@ -369,7 +369,9 @@ public class DragLayout extends LinearLayout {
 
         // Start animating the drop UI out with the drag surface
         hide(event, dropCompleteCallback);
-        hideDragSurface(dragSurface);
+        if (handledDrop) {
+            hideDragSurface(dragSurface);
+        }
         return handledDrop;
     }