Merge "hal: fix trailing sound heard during a2dp codec switch"