[automerger skipped] Merge "Require permission to unlock keyguard" into...

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df -s ours am: 8fbbc0c9 -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: Iffe9d6becb537fde9d8f445996b96efad821ebb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>