Merge "DO NOT MERGE Remove superfluous resetting of Keyguard on unocclusion." into rvc-qpr-dev am: 7dc8ba8c37

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

Change-Id: I36ba11509cebbe7a85609b65ef4f7c6e3f7f7d81