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

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



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