Merge "AudioDeviceBroker in audio service"