Merge "Merge "Up contrast for empty overflow text" into rvc-dev am: b16cc118...

Merge "Merge "Up contrast for empty overflow text" into rvc-dev am: b16cc118 am: 43798166 am: 069c9ef4" into rvc-qpr-dev-plus-aosp am: bfab876d

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

Change-Id: I76dc4eca6c98f72acdd683de45b3954e5a22a497