Merge "Use UUIDs for call management in Headset Client (HF)" am: 678ba245 am: 958dab93 am: 9527a19c am: 6b2b2a87 Change-Id: I48705f864b31912538bfc8fdd6ca3749c11becb7