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: Iaf9e41e0a0c11b8ce37979c1804b3eb7a8593ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>