[automerger skipped] DO NOT MERGE Remove superfluous resetting of Keyguard on...

[automerger skipped] DO NOT MERGE Remove superfluous resetting of Keyguard on unocclusion. am: 92d80a96 am: 0f349ed8 -s ours am: e8f83e0f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic10fe6c0f88f8bf0237963ef87da2f38df54392d