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

Merge "Up contrast for empty overflow text" into rvc-dev am: b16cc118 am: 43798166 am: 7f5273af am: f376e94b

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

Change-Id: I888950a44a9d34f69e767be75490ebc7dfaeb46f