[automerger skipped] [DO NOT MERGE] Keyguard - Treat messsages to lock with priority am: 21e48cf26b -s ours am: 77d8bbe5c5 -s ours am: 4f48adfd75 -s ours am: 842950c4f3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0e4f04fd4e3fea0617350c711e1d81d8a367aad3