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

[automerger skipped] Merge "PBAP: Dynamic Version Upgrade for PBAP 1.2 supporting remote" am: 5b95ee4c -s ours am: 5f6fab3d -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: Ic526e1e3f2bd7329fdb2ad8d33e3a2d75760a667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>