Merge "DO NOT MERGE Update volume dialog colors" into pi-dev
am: aa8391d544

Change-Id: Ib5c23f8f1ad2866ddd796e4a0e7b522734d9e5f5