tree 60ae8ec41b8d16efc920e9bc97d5bfdd80c68503
parent 045520b7c43d5b6837b96dba0c5ad6bf7e02bfd9
parent 75564c4cfdfe8b307a37e236226e0115aae347f5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1696462739 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696462739 +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: 1efe53e8a6 -s ours am: 61ecdb33a9 -s ours am: 75564c4cfd -s ours

am skip reason: skipped by user beverlyt

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

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