Merge "[DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device am: 8c92bde3 am: dd1882ec" into qt-qpr1-dev-plus-aosp