Merge "fix initial "hfp-enable" state of HFP client state machine."