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

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

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