[automerger skipped] Require permission to unlock keyguard am: 712ec1f4 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history

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



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