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

[automerger skipped] Allow shell to control transition animations am: 8bddf509 -s ours am: f143b5a7 -s ours am: 4899b2b3 -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/+/24126330



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