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: 50a6b46f

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



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