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

Change-Id: I48705f864b31912538bfc8fdd6ca3749c11becb7