Merge "Fix the text color in the dark theme" into udc-dev am: 1c650f61

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



Change-Id: I263621883a3d9cbdc0e437718de2b9284796361c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>