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

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



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