[automerger skipped] Merge "system/bta/le_audio: Conflict resolution for...

[automerger skipped] Merge "system/bta/le_audio: Conflict resolution for libbluetooth_log migration" into main am: 8c1a26ea am: 5b35abdc -s ours

am skip reason: Merged-In I376825735f18cb41543c435d9c3846538ea7c03a with SHA-1 90398f2d is already in history

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



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