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 am: e12ddd0e

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



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