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

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

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