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

Merge "Fix Chooser enter transition animation" into tm-dev am: 8d5bcaa5 am: 368670ca am: 9c949ef5

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



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