[automerger skipped] Merge "DO NOT MERGE Remove superfluous resetting of...

[automerger skipped] Merge "DO NOT MERGE Remove superfluous resetting of Keyguard on unocclusion." into rvc-qpr-dev am: 7dc8ba8c am: 2f669431 -s ours am: 2071aacc -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3c179480cf19c8afae47aa2e0540432d60265494