[automerger skipped] Merge "DO NOT MERGE Update volume dialog colors" into pi-dev am: aa8391d544
am: 75d5e40387  -s ours

Change-Id: I7454dcba5e3162db8c9da02aa1fc829df8549ca8