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