Merge "BT: Aptx Adaptive R2 enhancements" into q-keystone-qcom-dev