Merge "Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP" am: 0aafefb113 am: a8505da2a6 am: 82a6cf1597"