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

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



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