[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE...
[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff am: 618b808b
am: c05958ec -s ours
Change-Id: I57dfe29eff8188f32d64d003781d4b63b4d151ad