Merge "TWS-A2DP: Remove TWS+ codec entry hack" into p-keystone-qcom