Merge "The sonification sound is muted during a shutter sound" am: a4c38d6eb4 am: 2b82a9a1b1
am: 95c3e899e9

Change-Id: I73cd7bcf00440c320551f191cb6716ad22b13439