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

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

Change-Id: Ib9ab9f740e096ce901155ed73a40504bd7ed9863