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