Merge "Ensure text contrast" into udc-dev am: 0b02b77b7a

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

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