Merge "Fix colors in importance and conversation priority preferences" into...

Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e am: 4d3b967f am: 87d6681e am: 41e2eb22

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23690613



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