[automerger skipped] Merge "Ensure exit animations are canceled prior to user...

[automerger skipped] Merge "Ensure exit animations are canceled prior to user switch" into udc-dev am: 28ee2589 am: bafd0ae4 -s ours am: 0a477bd6 -s ours

am skip reason: Merged-In Ib262129422e6198f019482547a6b129cc60f0865 with SHA-1 653159f6 is already in history

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



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