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

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>