[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: d5d56cf4 -s ours am: efa9ffae -s ours am: faab6422 -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: I3733de56e0ab7cf0311f240c24054561b4cc5e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>