Merge "Simplify logic for connect in HfpClientProfile"
am: 57d9052ce8

Change-Id: If8fed65f3e0760c4ba7e16908f3c720eefa60162