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

* commit '77249c550ffc97b5f92150d544e661e17d530332':
  Revert "Revert "AudioPolicyService: fix race in AudioCommandThread""