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

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

Change-Id: I8fbb87ba9df7af5b16a154cac52522ceb6df220e