[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: b8bb0a94 -s ours am: aa7d1651 -s ours am: 195d5570 -s ours

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

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



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