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

[automerger skipped] Require permission to unlock keyguard am: 55b83227 -s ours am: 77955b22 -s ours am: f578d212 -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/+/24342146



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