[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-qpr1-dev am: 76b6d84452 -s ours am: 6c73f28cbc -s ours am: d39052c7be -s ours am: df85f263bc -s ours am: 09270a1ec5 -s ours am: b7b2a649ea -s ours am: 80f69e77f1 -s ours am: 9c700b5034 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74cf is already in history

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

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