[automerger skipped] Merge "Require permission to unlock keyguard" into...

[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b27240 -s ours am: 30316315 -s ours am: 8ba21792 -s ours am: f72e484d -s ours am: 790fbfb3 -s ours am: 8dd736d3 -s ours am: f4f4929a -s ours am: a8c8808a -s ours am: 3fcc68b0 -s ours am: e2fa7977 -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/+/24341231



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