tree 74a42c83567bf91f47c8ab123b7c177047de36bc
parent ee5ce751e302a91ca9396fe0accd211a34422092
parent 7873a6eeb680e1b70beed94a72fbc920a0f1b350
author Marzia Favaro <marziana@google.com> 1695075579 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695075579 +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: ed66255cab -s ours am: 1e4cc975ff -s ours am: 5c31ee97b0 -s ours am: 7873a6eeb6 -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: I3fd8838180d2757b47977a29427f6b3185837dbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>