am f5cae7d1: (-s ours) am 38702d5f: Merge "DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile." into gingerbread

Merge commit 'f5cae7d1c516ad233d7ec833c23c046e2501ec56'

* commit 'f5cae7d1c516ad233d7ec833c23c046e2501ec56':
  DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile.