Merge "Merge "Fix Chooser enter transition animation" into tm-dev am:...

Merge "Merge "Fix Chooser enter transition animation" into tm-dev am: 8d5bcaa5 am: 368670ca" into tm-d1-dev-plus-aosp am: 2225b531

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



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