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

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

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