Merge "Allow shell to control transition animations" into udc-d1-dev am: c1590ab67f

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

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