tree 86be81befe26b3668c0cf5761e43d751e93f9a2c
parent b78c51eac36cfb49e6c1479767c4f8f8e66960c0
parent ae62a32de656d7ed803a89b5a670f9526daf3351
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1696452941 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696452941 +0000

[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into rvc-dev am: 031d34974d am: 98df1c6e3f am: 775cbd02d7 am: ae62a32de6 -s ours

am skip reason: Merged-In I70fdae80f717712b3dfc9df54b9649959b4bb8f0 with SHA-1 faaf58d3b9 is already in history

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

Change-Id: Ifbb4fcb9c7225460ba337e2490c311c90e092945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>