[automerger skipped] Merge "Fix the text color in the dark theme" am:...

[automerger skipped] Merge "Fix the text color in the dark theme" am: a0f6a975 am: 44825f3b am: 2d6c1b6f -s ours am: d1000d86 -s ours am: f5c45b7f -s ours

am skip reason: Merged-In I6935bce627e7b28c3a9386c1f52b3953e4d1f5c3 with SHA-1 5dcd6da3 is already in history

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



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