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

[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b -s ours am: 5173b798 -s ours am: ea9e51e3 -s ours am: 620b89a8 -s ours am: 7c2f597c -s ours am: 511dee95 -s ours am: d9fe035e -s ours am: d51ad40a -s ours am: c99d9b62 -s ours am: 9e733379 -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/+/24341231



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