Merge commit '38702d5f1c42e2dfcc8fa5472c8fe842b4056914' into gingerbread-plus-aosp * commit '38702d5f1c42e2dfcc8fa5472c8fe842b4056914': DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile.