[automerger skipped] Merge "Simplify UI and animation choreography a bit" into...

[automerger skipped] Merge "Simplify UI and animation choreography a bit" into sc-dev am: a7e2e4b5 am: ba764ea7 -s ours

am skip reason: Change-Id I3b84da3592970ac5c2a5eb34326eabaef003993f with SHA-1 b5624dc6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida8d56ed39da620e5e817964d89c2c294fc9d193