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

[automerger skipped] Require permission to unlock keyguard am: 41bc7c00 -s ours am: d7cadc03 -s ours am: 0bfd4922 -s ours am: 0f150849 -s ours am: ecfbb810 -s ours am: d291a5f2 -s ours am: 648d089c -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/+/24342145



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