[automerger skipped] Merge "Update Opus over A2DP to use BluetoothCodecConfig...

[automerger skipped] Merge "Update Opus over A2DP to use BluetoothCodecConfig api" am: bc292d74 am: 286ba435 am: 19d76947 -s ours am: 47f8cb3c -s ours

am skip reason: Merged-In I113bc8b9f7a2bc17ae483929a2d7574f200e405f with SHA-1 572b8b93 is already in history

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



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