[automerger skipped] Merge "Simplify logic for connect in PbapClientProfile" am: 7cfbdcc481 am: cee5628c9b
am: 006b6d942b  -s ours

Change-Id: I000f701cfe2118741bc2a45b8f5d71993b095249