Merge "Disable priority conversation widget for secondary users" into...

Merge "Disable priority conversation widget for secondary users" into sc-v2-dev am: a665e2d3 am: e8f41307

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



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