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

* commit '2fb59515d44d2ce68db29b5d88476ee6a3282b2f':
  Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""