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

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



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