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

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 03279550 -s ours am: 5e73bd81 -s ours am: 4eef0a5a -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history

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



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