Merge "Adding mustPlayShutterSound to break Cam2 dependency on Cam1" am: cb6c04738b am: 9b83844f48

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1911999

Change-Id: If3fc78d7c5e3a4813bb3ff5cd9e83b60af4857dc