[automerger skipped] PBAP: Dynamic Version Upgrade for PBAP 1.2 supporting...

[automerger skipped] PBAP: Dynamic Version Upgrade for PBAP 1.2 supporting remote am: 6fa8e020 -s ours am: 56928350 -s ours

am skip reason: Merged-In Idf4edbc4b39506855ecf6245a96eca5706082256 with SHA-1 585f29e5 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2348727



Change-Id: I863ea4804dcb2e44bf9e796812d0788c40dd455b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>