Merge "BT: Updating codec priority" into p-keystone-qcom