Merge "Use UUIDs for call management in Headset Client (HF)" am: 678ba24533 am: 958dab93cd
am: 9527a19cbc

Change-Id: I9590f32bad7a3fccaf4479d3ffd004d2b7a91dad