Merge "Add animation for drag to freeform cancelled" into udc-dev am: ca7c1492 am: 48b4e5d1

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



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