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

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

Change-Id: Idb8c87169627dd4068948c9402b56988c0e31507