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

* commit '1fcbd9b0e973d662ed566967af71c8f5b2383320':
  Revert "AudioPolicyService: fix race in AudioCommandThread"