Merge "Simplify logic for connect in HfpClientProfile"