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

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into tm-dev am: 6ddb560a -s ours am: 90a76e03 -s ours

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

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



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