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

am skip reason: subject contains skip directive

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

Change-Id: Iee7206e26434019b42da819d9bb0530222873dd2