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

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>