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

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

am skip reason: Merged-In If00ce6794aac9ed88535d12aafaefa64508c4034 with SHA-1 e8c6a13a is already in history

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



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