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

[automerger skipped] Require permission to unlock keyguard am: 7f28e3ea -s ours am: cbdde0eb -s ours am: f4eace97 -s ours am: 7c2b1325 -s ours am: 219d6da5 -s ours am: 7b2ead40 -s ours am: 2acb7db5 -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: I33f9a663d589bbc7b97e97699c79de6552f5b22e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>