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

Merge "[automerger skipped] Merge "Revert "Fix a test in BluetoothOppLauncherActivityTest"" into tm-qpr-dev am: b55f7df7 am: ac71cdd0 -s ours" into udc-dev am: 0e0a6088 -s ours am: 8dca5e31 -s ours

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

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



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