[automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-v2-dev am: da1701ce29 -s ours am: 25d5a2449e -s ours am: 5aa7a6bda6 -s ours
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 256b5f08a8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17155535
Change-Id: If34cada09818621c59180e21264dbd6aee473f22
This commit is contained in: