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

am skip reason: subject contains skip directive

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

Change-Id: Ia9ef06be19516572303b962b988858223a98b9d1