Merge "Allow shell to control transition animations" into udc-d1-dev am: c1590ab6 am: 0e1f71e5

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



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