[automerger skipped] Merge "Fix failing test of...

[automerger skipped] Merge "Fix failing test of BluetoothOppBtEnableActivityTest" into tm-qpr-dev am: 2f7df25c -s ours

am skip reason: Merged-In Ia87a963e7b9b57fe9979320972218126c268e1c2 with SHA-1 f2e5e576 is already in history

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



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