tree 04f8b035c0d08560e0661e17e574969a3f279c43
parent 6ec6ea0cb35bc8dd5dbee45ae366dc8d68272c13
parent 915135e896d73ac7928eff9747023520473b8f30
author Marzia Favaro <marziana@google.com> 1695079287 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695079287 +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: bedfad328a -s ours am: e17affc8d4 -s ours am: d6f9187710 -s ours am: 4695891918 -s ours am: fddaccd6da -s ours am: 915135e896 -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: I1a465da31f12af5af47bdf9a06a2da8ae5339d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>