[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: f6097dbd -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: Id0f84f6f2cceaaf86df51d5492eb6a4f33fbdef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>