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: ee0d1171 am: f5bc25cd

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



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