am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"

* commit 'ba64d298bee228b8e27ea17fb31fbff4b4188304':
  AudioService: fix cross deadlock in VolumeStreamState