[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: 435be105 -s ours am: 33e953ec -s ours am: 9747f65e -s ours am: 46cf236e -s ours am: 7cb4d9a5 -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: I3b99c37867c5b76bbd8c2d92ff3599e02c839032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>