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

[automerger skipped] Revert "Fix a test in BluetoothOppLauncherActivityTest" am: b85ff4c7 -s ours am: 659e0a9b -s ours am: 5406c24d -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: I9d5afde8adaa38c561d9e5ddf9eee3ddb97f4304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>