Merge changes from topic "wmshell-androidx-animation" into udc-qpr-dev am: d281cada

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



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