[automerger skipped] Merge "Add test & fix bug for BluetoothOppServiceTest"...

[automerger skipped] Merge "Add test & fix bug for BluetoothOppServiceTest" into tm-qpr-dev am: 3a1c422f -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: Ie36accf6da04ec0c4feb5741593829aed0835b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>