[automerger skipped] Merge "Add tests for...

[automerger skipped] Merge "Add tests for BluetoothPbapObexServer#onGet/onSetPath" am: 7d93c7e1 -s ours

am skip reason: Merged-In Iaec622d8c110754d1d7c84fad8a8a056fa70b538 with SHA-1 abf4c865 is already in history

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



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