[automerger skipped] Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev am: 205479c25d
am: 04e48eae76  -s ours

Change-Id: I1eb7a863a6467bc62a0234abd291ae360cdddf6c