Merge "Add test & fix bug for BluetoothOppServiceTest" am: 0a44d150

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



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