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

Change-Id: I4cebaf6741c2f1a6ee567ee8fc0afa5ae5ddc43e