Merge "TWS-A2DP: Do not allow legacy connection if TWS+ connected" into p-keystone-qcom