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

Change-Id: I137a8ad1c0e15eeb224a4ce781b55fa737d8a26a