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: a933f89f am: c53e4295" into rvc-qpr-dev-plus-aosp am: 5fb644ce

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

Change-Id: I4a7a196bd4743b4f65ffc1a35d58ecd7ad684cdf