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

Change-Id: Ia6c53256ed4bd2c223d11c79cce19ad6ef0f0a63