[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: 658c7832 -s ours am: 184533c8 -s ours am: 02e8fa5d -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: Ib5db736877f1f0cd7c791a9275c28c96549ec54f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>