[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-qpr-dev am: 7ef655d2 -s ours

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

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



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