Merge "Correctly remove drag surface when perform drag failed" into...

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

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



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