Merge "Fix colors in importance and conversation priority preferences" into udc-dev am: bd74e47e

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



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