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

[automerger skipped] Merge "Add tests for BluetoothPbapObexServer#onGet/onSetPath" into tm-qpr-dev am: dcdfd9db -s ours am: 43d8e011 -s ours

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

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



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