Merge "Simplify logic for connect in PbapClientProfile"