[automerger skipped] Require permission to unlock keyguard am: 712ec1f4f8 -s ours am: 8e952270a0 -s ours am: 17b2d055ad -s ours

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

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

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