Merge "Update A2DP device connection state properly."