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

Change-Id: Iac8d9061cf1022495d528ec3d240f1793030cc9c