Merge "AudioService: fix cross deadlock" into qt-dev
am: 076b22f987

Change-Id: I3d48403142747f77ee786a084a60b6087aab831d