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

[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033 am: 4397e741 am: 89a3862e am: 8aaad2a2 am: c4e7a608 am: fa1f3f3c am: ff53f5a2 am: 7bc2322a -s ours

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

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



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