tree 6a06bb695b3db7ba14c11417656a8d1c28f44e27
parent 709aca3d00c055af9a925897dc21c6b20ef9e93a
parent 971b800cf0dff60dc0c78814870540421ff27845
author Beverly Tai <beverlyt@google.com> 1695056740 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695056740 +0000

Merge "Revert "On device lockdown, always show the keyguard"" into udc-qpr-dev am: 971b800cf0

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

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