[automerger skipped] Merge "Keyguard - Treat messsages to lock with priority"...

[automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-v2-dev am: da1701ce -s ours am: 25d5a244 -s ours

am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 256b5f08 is already in history

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

Change-Id: Ie024b57fc22acde35e71a94dddf2f3bf466724c3