Merge "Merge "Merge "Volume iconography update" into pi-dev am: 4a498757" into pi-dev-plus-aosp am: 85ad466c"