tree 20e46bbcc80d62d575cb84db84bd7fc9dc0852cf
parent 38a00fe9e82c58b8dc92f73ccc58c662ca4520ac
parent ddaa1aac83f3e22a981c1529bf749ea8c77f0bf4
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1696465851 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696465851 +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: 5200fce012 -s ours am: ad73da7f08 -s ours am: 9b4ab43d7b -s ours am: 0b5a34c257 -s ours am: 896c255adf -s ours am: e80ef17eac -s ours am: ddaa1aac83 -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: Ie97476907270509acf2f567c90658b60ba962f3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>