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

Change-Id: I45ec4ad0a2128491356982898780e7046b8f5be3