tree 22661ac57cd423cb3d5bb9356fa8b6b23d87f30f
parent aa406481c40564da8ac917a46c10b6a026724e69
parent 1d42887320cd0017d43697976ff65a6a48270bf8
author Marzia Favaro <marziana@google.com> 1695075808 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695075808 +0000

[automerger skipped] Require permission to unlock keyguard am: 41bc7c0042 -s ours am: 1bedc66ed3 -s ours am: 5e35aad2a2 -s ours am: 1d42887320 -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/+/24342145

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