tree 07666361481c38137b92058ec9176cc77375e785
parent 6639abc0dcc96ae75a0972ade79f6acc36083c82
parent b52e157b35b0c2765494a5b8b8878931e0591fa8
author Marzia Favaro <marziana@google.com> 1695209345 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695209345 +0000

[automerger skipped] Merge "Require permission to unlock keyguard" into tm-qpr-dev am: bc9059ae54 -s ours am: 3946267559 -s ours am: b52e157b35 -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/+/24342146

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