[automerger skipped] Merge "On device lockdown, always show the keyguard" into sc-v2-dev am: d978682f24 am: 6322292206 am: 2aaea3e4ea -s ours am: a12b873b1d -s ours
am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 c851ef6d27 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23090199
Change-Id: Id8b9cb792cb9de916aa42d91d6b0515d38b6c507
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: