[automerger skipped] Migrate PBAP server enable/disable to sysprops am:...

[automerger skipped] Migrate PBAP server enable/disable to sysprops am: 21f021a8 am: a23f4f3b am: a1c46389 -s ours am: 40f6d3bc -s ours

am skip reason: Merged-In I4d4747e67fdb6d459b62ddb8b1782c640463cdbb with SHA-1 cd270220 is already in history

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



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