[automerger skipped] Merge "Add tests to cover OPP activities tests" into...

[automerger skipped] Merge "Add tests to cover OPP activities tests" into tm-qpr-dev am: 6bde446e -s ours am: 8ff9b31e -s ours

am skip reason: Merged-In I33ac0f4b2d7f953ae397d25158999c5ee6debf9c with SHA-1 134951c0 is already in history

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



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