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

[automerger skipped] Merge "Ensure exit animations are canceled prior to user switch" into tm-qpr-dev am: a5f81b67 -s ours am: 4b624587 -s ours am: 5983ac84 -s ours

am skip reason: Merged-In Ib262129422e6198f019482547a6b129cc60f0865 with SHA-1 5adb3167 is already in history

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



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