Merge "The sonification sound is muted during a shutter sound"
am: a4c38d6eb4

Change-Id: Iddd951781a8c9774bcd74823f2d0085777d267de