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

Change-Id: I20942e3102943f593f706ffa7b900787cfee2266