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

[automerger skipped] Merge "Allow shell to control transition animations" into udc-dev am: dca0a91a am: 71c48039 -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: I67e55c10a1259fa5fcf23cc192d065da71aa7fa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>