[automerger skipped] Disable priority conversation widget for secondary users...

[automerger skipped] Disable priority conversation widget for secondary users am: b0522df0 -s ours am: c7395484 -s ours am: 2f082e1a -s ours am: 17f9c965 -s ours am: c90335ef -s ours am: aebbf096 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



Change-Id: I8aad153fbcf187ddc9a841e038169eb4efafbe66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>