[automerger skipped] Merge "Disable priority conversation widget for secondary...

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-v2-dev am: a665e2d3 am: e8f41307 am: 25b8fa5e -s ours am: d92dacc7 -s ours

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

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



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