[automerger skipped] Merge "Disable priority conversation widget for secondary users" into udc-dev am: df8862010c am: b8bb0a94d6 -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/+/24575247

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