Merge "HFP: Don't suspend A2DP when HFP is not connected" into p-keystone-qcom