Merge "Simply logic for connect and disconnect in HeadsetProfile"
am: 7aae482135

Change-Id: I59e9d745d64f20e84dd888f3981290b9296f4815