[automerger skipped] Merge "Revert "Fix a test in...

[automerger skipped] Merge "Revert "Fix a test in BluetoothOppLauncherActivityTest"" into tm-qpr-dev am: b55f7df7 -s ours

am skip reason: Merged-In Ib9ff8d58fae447cb8f29bfa3fd7de7c2eb9c15b7 with SHA-1 aa2182ef is already in history

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



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