tree 2399ad67a9f64fe349e47f08e0eac7a15df895bc
parent 64fd1622cabff19218f9b7da343f65ea269a9f15
parent 4eef0a5a1ce7fef3d69dfae0a21deb3f64bbd875
author Marzia Favaro <marziana@google.com> 1695063201 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695063201 +0000

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 0327955073 -s ours am: 5e73bd8193 -s ours am: 4eef0a5a1c -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c0042 is already in history

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

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