Merge "Fix that the color of each option and subtext of Display size and text...

Merge "Fix that the color of each option and subtext of Display size and text has the color difference." into tm-dev am: 62be1f27 am: 9e608223

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822268



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