Merge "Fix Resolver dragging animation" into tm-qpr-dev am: adad5c91 am: 7de4fa9b

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



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