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: 17405aa5

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



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