Merge "AudioService: fix A2DP disconnection / reconnection" am: 2faf009dda am: bb251a1da9

Change-Id: I8c98c6a7a7824d799f260f07e25342fe630806f2