am 5231cb4b: am b928b7c2: am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"

* commit '5231cb4bfbdd20200555f263ee73b439e33d1ec0':
  AudioService: fix cross deadlock in VolumeStreamState