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

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into tm-qpr-dev am: f55767f1 -s ours am: 7e7c4e94 -s ours

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

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



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