Merge "Merge "[Fgs Manager] Increase contrast between text and background"...

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

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



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