Match 'color' rules to 'background-color' rules for accessibility

Bug: 72848
Change-Id: I630e9e9b9f9949649badd2e54f78d73c6f0c24a6