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: Ic1737e762e7e78b3f3846f3b6ad31efeaec8ce9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>