Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033

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



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