Merge "Update text, colors, and suppression" into sc-dev am: 39e9e83e00 am: bea2b82c2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14937171 Change-Id: If38c990d3a3a3c7ac9489d51f8f73ac061c132b1
This commit is contained in: