Merge "Enable phone apps to mute the BLUETOOTH_SCO stream" am: 09d13a2232 am: b0395aca6a
am: b442507023

Change-Id: I0f1f761460a27d510271e2110bd3588f34ce086c