tree 967cbe95ed3c2c7eb509aef7ac5d5b65c26ace05
parent 246b5cd2bf28c871385458d36e234fb088edb838
parent 7b474f9d1378322e3b71aed7a2f3416a1bb6354a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1696285821 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696285821 +0000

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into sc-v2-dev am: 584df59ac8 -s ours am: 3815edc6e2 -s ours am: 3307ef05ee -s ours am: 742411fe53 -s ours am: f56e799c49 -s ours am: dc974fbaf9 -s ours am: 7b474f9d13 -s ours

am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 b23c2d5fb6 is already in history. Merged-In was found from reverted change.

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

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