Merge "Fix color lint" into tm-dev am: 3c4b7c53

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



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