[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 ad092a33 is already in history

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



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