[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: 842950c4 -s ours am: f22338cc -s ours am: 7b811049 -s ours am: 030a0db0 -s ours am: 393a0011 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iebe0087d0d3aa2ba6b3ae716afac4e7a62cb2594