Merge "Merge "fix initial "hfp-enable" state of HFP client state machine." am: 3e56faafed am: c21a6101e7 am: f6c97d9a5b" into pi-dev