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

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

Change-Id: If8f30c48857c037caaf3d6b264f3f3433e6a28e1