Merge "Update text color." into sc-dev am: a40b1cb418

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

Change-Id: I89291d0067f7e6d9bbf347abe538fb9869d5d6ef