tree e90781ad8807230e77995bd0b11c6f8474bba90d
parent 3b02f9e5bd0f4a6b3642971ed2e109dff0b93505
parent 7b2ead4023dc0a87df07385aa86e065f1d6fb947
author Marzia Favaro <marziana@google.com> 1695066196 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695066196 +0000

[automerger skipped] Require permission to unlock keyguard am: 7f28e3eaaf -s ours am: cbdde0eb62 -s ours am: f4eace9709 -s ours am: 7c2b1325e9 -s ours am: 219d6da566 -s ours am: 7b2ead4023 -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: I4bd141b7238a2c643ef72b2c27249acfe25e7721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>