Merge "AudioPolicy: support for add/remove AudioMix without unregistering"