Merge "Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""" into mnc-dev am: 6919fbe40d
am: 8c5b71ce47

* commit '8c5b71ce473517ea1270f6467fa518274bd54b35':
  Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""