tree 6d5a6a3d92aae7970d0538e73e028daceca36d65
parent 8aaad2a211f2f28c95f89ae1d624132aebb99f1d
parent 620b89a869bd91dfbd8b2a14f874e472e87e6eed
author Marzia Favaro <marziana@google.com> 1694801944 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1694801944 +0000

[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b1d -s ours am: 5173b7987e -s ours am: ea9e51e3cd -s ours am: 620b89a869 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history

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

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