[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-v2-dev am: a665e2d316 am: e8f41307f6 am: 25b8fa5e7d -s ours

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

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

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