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

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee866 -s ours am: c1e069ef -s ours am: 75495d90 -s ours am: bedfad32 -s ours am: e17affc8 -s ours am: d6f91877 -s ours am: 0122c6d8 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history

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



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