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

[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469 -s ours am: a8da8cbb -s ours am: 1cd2cab2 -s ours am: 997bd401 -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/+/24342145



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