Merge "AudioService: do not mute music systematically in setBluetoothA2dpOn" into 24D1-dev