Merge "a2dp: fix encoder sample rate update for aptx adaptive r2"