[automerger skipped] Merge "[DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device am: 8c92bde392 am: dd1882ec73" into qt-qpr1-dev-plus-aosp
am: cfc242659b -s ours
am skip reason: subject contains skip directive

Change-Id: I98c275c5789300f81928e59497d72af43826230a