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: 205135ff am: 20ac28df

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



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