[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: d76f2649 -s ours am: 9b5664c3 -s ours am: b064ace3 -s ours am: 5897b860 -s ours am: 75508ca7 -s ours

am skip reason: skipped by user juliacr

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



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