[automerger skipped] [DO NOT MERGE] AudioService: fix disconnect/connect of A2DP device am: 8c92bde392 am: ea1ac92c63
am: b1b2fa126e -s ours
am skip reason: subject contains skip directive

Change-Id: Icd66c7f499c82bc328ea3ab7b57ee723f9788ac7