[automerger skipped] Add test & fix bug for BluetoothOppServiceTest am:...

[automerger skipped] Add test & fix bug for BluetoothOppServiceTest am: aa0cdc63 -s ours am: a5370bbb -s ours

am skip reason: Merged-In I32a84781d8eb4e1893f627b583920b0ef346f9da with SHA-1 7bd6f7bd is already in history

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



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