[automerge] Don't re-hide the keyguard if it isn't showing. 2p: c3a2eeaed3

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


Change-Id: I598ee031ff7541219abde8ea2f2bd631ce4c5c58
Merged-In: I00655c2e85c46bd0c52b77094757e155b1a6f9c9