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

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-qpr1-dev am: 76b6d844 -s ours am: 6c73f28c -s ours am: d39052c7 -s ours am: 90893cff -s ours am: add8193a -s ours am: 04cc4301 -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/+/24575089



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