[automerger skipped] Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e am: 618b808b61 am: c05958ecdd  -s ours
am: 6ec0b21544  -s ours

Change-Id: I14f1f1709d94784fdb0912f1c95b625d6318b4a0