Merge "Revert "AudioPolicyService: fix race in AudioCommandThread"" into mnc-dev