Merge "Merge "Overflow labels: higher contrast" into rvc-dev am: 8f73970e57 am: 133084250a" into rvc-d1-dev-plus-aosp am: 1a1c7076fc am: 66a656e8a6

Change-Id: I17792974e50fab3fc97c64794330add0c489c785