[automerger skipped] [automerge] Don't re-hide the keyguard if it isn't showing. 2p: c3a2eeaed3 am: 346f9c19bf -s ours am: a098ec58d3 -s ours
am skip reason: Merged-In I00655c2e85c46bd0c52b77094757e155b1a6f9c9 with SHA-1 22ae995c20 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17005881
Change-Id: Ib048c0adf4eeda46623ab306e5ab9a1f730cd2c0
This commit is contained in:
committed by
Automerger Merge Worker
commit
c6f5dfc7bd