tree a34dc7f6b26864bccfe812c6c0d7be23bc0eba43
parent ebd0e3910ad47d34c5ec0fabdddc45318356d6a2
parent 1b77ed7e53567415ac073073243e60dab9edf520
author Beverly Tai <beverlyt@google.com> 1696366484 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696366484 +0000

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9f1 am: 4f8e0db44f am: af9de2e62c am: 8efa785f9b -s ours am: be822171e8 -s ours am: 99a7448b5b -s ours am: b73ed7113f -s ours am: 1b77ed7e53 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e672 is already in history

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

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