[automerger skipped] Merge "Require permission to unlock keyguard" into...

[automerger skipped] Merge "Require permission to unlock keyguard" into udc-qpr-dev am: fe518197 -s ours am: 3cc39d59 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1d is already in history

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



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