Merge "BT: Increase Aptx-Adaptive codec priority" into p-keystone-qcom