[automerger skipped] [DO NOT MERGE] Keyguard - Treat messsages to lock with...

[automerger skipped] [DO NOT MERGE] Keyguard - Treat messsages to lock with priority am: 21e48cf2 -s ours am: 77d8bbe5 -s ours am: 4f48adfd -s ours

am skip reason: subject contains skip directive

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

Change-Id: I72b7f189030f09cd6a24a9fa02c04b43bd2e403a