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

Change-Id: I4294475e685fea912cf942da18d95a77dccb01eb