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