tree 2727a1c537f41f85d3d4d6bba2dd2125b9506ac1
parent 58bc49da23df9a80f5430f45b3f91378223604e4
parent 2ea35af4e7fd9df83f68384398d21bafeb81bf4d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1696462818 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696462818 +0000

[automerger skipped] Merge "Updated: always show the keyguard on device lockdown" into sc-v2-dev am: b78c51eac3 -s ours am: 4f2e9968e8 -s ours am: 0ef05eedea -s ours am: 2160024dae -s ours am: fa1bc4a7ef -s ours am: 2ea35af4e7 -s ours

am skip reason: skipped by user beverlyt

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

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