[automerger skipped] Require permission to unlock keyguard am: 6568e40b -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: Ia7b9b8c094cedb5f158f5d2854f1d73b0f24fcf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>