Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d am: 8aaad2a211

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

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