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

Change-Id: I899ee627557f15b16bd3dbc1a89a4be5f1030de2