[automerger skipped] Merge "Merge "[DO NOT MERGE] AudioService: fix...

[automerger skipped] Merge "Merge "[DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device" into qt-r1-dev am: 11d2f965 am: 0d30d345" into qt-qpr1-dev-plus-aosp
am: 973efbe3 -s ours
am skip reason: subject contains skip directive

Change-Id: I81be9647f4468a02e6f68b2a2b41e3e7f17930bc