frameworks_av: fix camera shutter sound feature

another merge derp

Change-Id: Ice260117ea636e5645674ec533d126428c636693

Conflicts:
	services/camera/libcameraservice/CameraService.cpp