HFP: Fix regressions in HFP state machine
am: e5528ec2c1  -s ours

Change-Id: I98fecc910c591b04ea17f76cbc45e83732345d87