[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: 3371c14a -s ours am: 306ac204 -s ours am: 8f784847 -s ours am: 3b02f9e5 -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: I7ccd5592b9bbe70284e71a2ea74f21abe8155c0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>