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

[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b27240 -s ours am: 30316315 -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/+/24341231



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