[automerger skipped] Allow shell to control transition animations am:...

[automerger skipped] Allow shell to control transition animations am: d6ea6cb6 -s ours am: 7ac8c313 -s ours

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

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



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