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

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

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



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