[automerger skipped] [automerge] Don't re-hide the keyguard if it isn't showing. 2p: c3a2eeae am: 346f9c19 -s ours am: a098ec58 -s ours am: c6f5dfc7 -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: I1064ba1d88f322fc382fc992e9aafd54fd6206e3