[automerger skipped] Merge "Don't re-hide the keyguard if it isn't showing."...

[automerger skipped] Merge "Don't re-hide the keyguard if it isn't showing." into sc-v2-dev am: 0d8f1067 am: 1706cecb -s ours am: 5123bbc2 -s ours

am skip reason: Merged-In I00655c2e85c46bd0c52b77094757e155b1a6f9c9 with SHA-1 22ae995c is already in history

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

Change-Id: Ic9fd6c44ab0843fcc8eb13efcaa01dacad852d20