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

Change-Id: Ibb358a8270867752ce834429f914db21ec1c4c7d