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

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



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