tree 7611d84c76ba6d7a85becaa16ebc528f2961cbbe
parent 9d5807a5eabada4b6f500c46ea7fb344c3106bcb
parent 9c98f29a88121f61e109dad6e5884f347a34376b
author Beverly Tai <beverlyt@google.com> 1684259911 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1684259911 +0000

[automerger skipped] Merge "On device lockdown, always show the keyguard" into rvc-dev am: cc94a5377e am: efb376fe39 am: d0888dab48 am: 23532ed546 -s ours am: 9c98f29a88 -s ours

am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae42365 is already in history

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

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