[automerger skipped] Merge "Remove all pending keyguard exits on SHOW" into...

[automerger skipped] Merge "Remove all pending keyguard exits on SHOW" into udc-qpr-dev am: a0570669 -s ours

am skip reason: Merged-In I732fb7d577a5f4c65c8d84cc66a61f5006ed8d53 with SHA-1 8853b2c7 is already in history

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



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