Merge "Merge "Overflow labels: higher contrast" into rvc-dev am: 8f73970e57 am: a5924309c4" into rvc-d1-dev-plus-aosp am: 294051f7d2 am: aecefcf513

Change-Id: I23a4f94b7c7d299e5f41e78de3606f46b41e6f9b