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

[automerger skipped] Merge "Remove all pending keyguard exits on SHOW" into udc-dev am: ebd031e2 am: 82c193fe -s ours am: 391b4508 -s ours

am skip reason: Merged-In I732fb7d577a5f4c65c8d84cc66a61f5006ed8d53 with SHA-1 447a116d is already in history

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



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