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

Change-Id: I9c41b9b76a8d741ca7d30f757f3404ac30c9d3a8