[automerger skipped] Merge "Add BluetoothPbapObexServerTest" am: 401c603c -s...

[automerger skipped] Merge "Add BluetoothPbapObexServerTest" am: 401c603c -s ours am: 358a415b -s ours am: 76202a4f -s ours

am skip reason: Merged-In I8813f812f7d4125eb0bdbef5953bc96fc2e0af7b with SHA-1 7c36251b is already in history

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



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