Merge "Update text, colors, and suppression" into sc-dev am: 39e9e83e am: 893c910b am: 2fa47fc4

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

Change-Id: Id1a9274b70ef500fb0d81f3422adccea3e77b51c