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

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



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