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