Merge "AudioDeviceBroker: fix short music mute when connecting a wired headset"