Merge "HFP: Don't advertise +BSIR, if in-band ringtone      not supported" into p-keystone-qcom