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

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889 -s ours am: fefbfeea -s ours am: 7bfeb1b9 -s ours am: 6f9b58df -s ours am: b8780fe6 -s ours am: 35b55f9b -s ours am: 43aaaacb -s ours am: ed3e830e -s ours

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

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



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