am 2664dab4: am b063cb62: Merge "Camera1: Fix enable shutter sound command error handling." into jb-mr1-dev

* commit '2664dab44dd61fde35be6806b0a4d5f1eb523df2':
  Camera1: Fix enable shutter sound command error handling.