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: 069c9ef4

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

Change-Id: I762716817e9e701f54bc7d450aec1fe1032de47b