Merge "Merge "Volume iconography update" into pi-dev am: 4a49875718" into pi-dev-plus-aosp
am: 85ad466c94

Change-Id: I98df77be5cb07cf6c4b5b61d65f35cb731b0e93f