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

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



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