Merge "[DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device" into qt-r1-dev
am: 11d2f96544

Change-Id: I3504228a7d3783edd6f869dd0892a2bc05ee6fb0