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

* commit 'd016cf5b12cb73bd49bcecb0d5a4958df23620c3':
  Camera2: Move non-ZSL shutter sound firing to be later.