[automerger skipped] Require permission to unlock keyguard am: 6568e40b -s...

[automerger skipped] Require permission to unlock keyguard am: 6568e40b -s ours am: 57e16d7f -s ours am: 1c170fba -s ours am: 304b9288 -s ours am: aa49d5c0 -s ours am: 3d487401 -s ours

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

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



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