Merge "Check PBAP Server before disconnecting"
am: 87d1cdd45e

Change-Id: I614fb1ec9b0d30df6f9879f6c0a46013941df439