tree 74e7ef040b9f4f8dcc356542909059e7fb504d3f
parent 2964d2acf8ad173c7e1c2d163360b1f84c12506f
parent 57e16d7fa70f10ebc17c3e71f4901ea1d8aa3bfb
author Marzia Favaro <marziana@google.com> 1695062791 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695062791 +0000

[automerger skipped] Require permission to unlock keyguard am: 6568e40be9 -s ours am: 57e16d7fa7 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c0042 is already in history

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

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