Merge "audioservice: fix a2dp connection race condition"