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

Change-Id: I460a78b62640315aa79b4167be6c9793015218ae