Merge "BT: Adding aptX-Adaptive codec entry to Framework" into p-keystone-qcom