[automerger skipped] Merge "Disable priority conversation widget for secondary...

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into udc-dev am: df886201 am: b3f76e9d am: 79878203 -s ours am: 616bcccf -s ours

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

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



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