Merge "HFP: Fix regressions in HFP state machine"