Merge "AudioPolicyService: Synchronize access to AudioPolicyManager"