[automerger skipped] Require permission to unlock keyguard am: 9ecf12f5d2 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history

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

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