[automerger skipped] Merge "Allow shell to control transition animations" into...

[automerger skipped] Merge "Allow shell to control transition animations" into udc-d1-dev am: c1590ab6 am: 0e1f71e5 am: 3dc08558 -s ours

am skip reason: Merged-In Iffe5625ae57c21874805ef98b67faac9f56f87f5 with SHA-1 0be0367e is already in history

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



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