Merge "[automerger] TWS-A2DP: Remove TWS+ codec entry hack am: 01b41f4d8e" into q-keystone-qcom-dev