[automerger skipped] Merge "Fix failing BluetoothOppLauncherActivityTest" into...

[automerger skipped] Merge "Fix failing BluetoothOppLauncherActivityTest" into tm-qpr-dev am: b132f610 -s ours am: f4370786 -s ours

am skip reason: Merged-In I0442b6548310137746a2c847e4ce2865db2ac404 with SHA-1 ecdacd6a is already in history

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



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