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

Change-Id: I1656753897ff28a9ff9096fee0ba9928623e75ad