Merge "Revert "AudioPolicyService: fix race in AudioCommandThread"" into mnc-dev am: cda4871486 am: 1fcbd9b0e9 am: dee38ac0da
am: e44a9c0666

* commit 'e44a9c0666b3861eb2676ddf91cbeb5ecd5b23a5':
  Revert "AudioPolicyService: fix race in AudioCommandThread"