am 12f6a11d: am 8e264a77: Merge "AudioService: fix cross deadlock" into lmp-mr1-dev automerge: 8befd6f

* commit '12f6a11de637406a066c532a07f9d4466a652af0':
  AudioService: fix cross deadlock