Merge "Don't re-hide the keyguard if it isn't showing." into sc-v2-dev am: 0d8f1067a4

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

Change-Id: I0a33a1eaec23cc4af8a5cce549ea7faba4e55a85