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

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

Change-Id: Ib36ec76a6c2f831aab448ef949f254400abd3726