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

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

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