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

Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033 am: 4397e741 am: 89a3862e am: 8aaad2a2 am: c4e7a608 am: fa1f3f3c am: ff53f5a2 am: c3f38312

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



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