[automerger skipped] Merge "DO NOT MERGE Show mute icon in sound settings page" into pi-dev am: 69ec1673df
am: 7f53974cbd  -s ours

Change-Id: Icfd2c6328fac65e8a72770dff2d240df7a6e5dae