Merge "AudioPolicyService: fix race in AudioCommandThread" am: 79f424c7b4
am: 554eb3c93e

* commit '554eb3c93e0e059310ce05ab033fd5683a4824bd':
  AudioPolicyService: fix race in AudioCommandThread