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

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



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