Merge "Update text, colors, and suppression" into sc-dev am: 39e9e83e am:...

Merge "Update text, colors, and suppression" into sc-dev am: 39e9e83e am: bea2b82c am: 1127aab9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14937171

Change-Id: Id6722138d5cbcf051d519fa3c7e0380b7a7b8ed1