Merge "a2dp: Fix BT SCO Tx configuration during a2dp to sco transition"