am 9486e8ca: am 874a4618: Merge "Camera2: Don\'t play shutter sound when doing a video snapshot" into jb-mr1-dev

* commit '9486e8cac69e0a9bfc20aee148c515f8237a6b3e':
  Camera2: Don't play shutter sound when doing a video snapshot