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

Change-Id: Ic426773bd4937efa815f3ab18e5fe06ec2999d0f