[automerger skipped] Require permission to unlock keyguard am: d41eb87422 -s ours am: 778fa05147 -s ours am: ed480a790f -s ours am: 3743abeff9 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339445

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