Merge "Don't reset the keyguard on occlusion if it's going away." into...

Merge "Don't reset the keyguard on occlusion if it's going away." into tm-d1-dev am: f50462e6 am: 9f8a5c02

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



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