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

Change-Id: Iafb904bef6c99f4c48ca9c2ef33ea4809924a4c1