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

[automerger skipped] Merge "Require permission to unlock keyguard" into tm-qpr-dev am: bc9059ae -s ours am: 39462675 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history

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



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