am 240a538b: am d016cf5b: Merge "Camera2: Move non-ZSL shutter sound firing to...
am 240a538b: am d016cf5b: Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev
* commit '240a538b':
Camera2: Move non-ZSL shutter sound firing to be later.