[automerger skipped] Require permission to unlock keyguard am: 41bc7c0042 -s ours am: d7cadc0378 -s ours am: 0bfd492240 -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/+/24342145

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