[automerger skipped] Require permission to unlock keyguard am: 712ec1f4 -s...

[automerger skipped] Require permission to unlock keyguard am: 712ec1f4 -s ours am: 8e952270 -s ours am: 17b2d055 -s ours am: 5578bf02 -s ours am: 33f66cdb -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/+/24342144



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