tree a731a05dd2f75880024316c60d3b8f8393fc0541
parent 21c03be91c1b06db193ded2881a6a00c15334fb4
parent 3b02f9e5bd0f4a6b3642971ed2e109dff0b93505
author Marzia Favaro <marziana@google.com> 1695068933 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695068933 +0000

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df4c -s ours am: 8fbbc0c975 -s ours am: 3371c14a70 -s ours am: 306ac20464 -s ours am: 8f78484790 -s ours am: 3b02f9e5bd -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40be9 is already in history

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

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