Merge "HFP: Only remove state machine when device is unbonded and disconnected"