[automerger skipped] Merge "Allow shell to control transition animations" into udc-dev am: dca0a91a93 -s ours am: 5be086b181 -s ours

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

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

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