Merge "HFP: Ignore CS non-call state update when virtual call start" into p-keystone-qcom