Merge "Merge \\"SoundPool: fix enforced camera shutter sound\\" into nyc-dev am: a2266f7a0f am: f638978b07" into nyc-mr1-dev-plus-aosp