[automerger skipped] Require permission to unlock keyguard am: 41bc7c00 -s...

[automerger skipped] Require permission to unlock keyguard am: 41bc7c00 -s ours am: 1bedc66e -s ours

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

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



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