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

[automerger skipped] Merge "Revert "Add test & fix bug for BluetoothOppServiceTest"" into tm-qpr-dev am: c4515c73 -s ours

am skip reason: Merged-In I6b6d6a3701959331327984964f6267f6c9f8e3c2 with SHA-1 9566c3d5 is already in history

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



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