Merge "AudioPolicyService: Synchronize access to AudioPolicyManager" am: 60cf8e8925
am: 62ac714617

* commit '62ac714617c3c994619afdc0666ac3359d8084e7':
  AudioPolicyService: Synchronize access to AudioPolicyManager