Merge "Check PBAP Server before disconnecting" am: 87d1cdd45e am: 7128032d13
am: e005b50ebb

Change-Id: I3e20e07f76c2fc90aaee0fe949e9fabf3137d920