Merge "Simplify logic for connect in PbapClientProfile"
am: 7cfbdcc481

Change-Id: I9e96f965c94671b31a25245acc70757fabf6ff7b