Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP"