Merge "Merge "[Fgs Manager] Increase contrast between text and background" into tm-dev am: f81c41aa am: cf8d94aa" into tm-d1-dev-plus-aosp am: 20dc3932 am: 4ac49d18

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



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