Merge "BT: Set aptX Adaptive codec priority" into p-keystone-qcom