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

* commit '874a4618b645ab5c1faaa738a871f52492f28de3':
  Camera2: Don't play shutter sound when doing a video snapshot