tree d28dda9c5276546308f83a83614149130b71c076
parent 7c2b1325e9816267f7144f5a482130e15696e5d0
parent 75495d90aeb5d1b97d31b1be443f01ed06b450b2
author Marzia Favaro <marziana@google.com> 1695060232 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695060232 +0000

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee8669f -s ours am: c1e069ef40 -s ours am: 75495d90ae -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4f8 is already in history

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

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