[automerger skipped] Merge "[DO NOT MERGE] Keyguard - Treat messsages to lock with priority" into rvc-dev am: 508167f720 -s ours am: cf13bbbc3d -s ours am: 2964f715c8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia591a0d500e545c5dedc7e726d1d3c30a45ce5b2