Merge "AudioPolicy: add synchronous unregister method"