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

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



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