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

Change-Id: I79a9cd20fc006bc6597d25fe9b846bceff1d5d1c