[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: a288914dcd -s ours am: 4b0435e04b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I18cb94b1a76be5baaa099d83e08282485f280785