[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: 96586702 am: 234832cd -s ours

am skip reason: Merged-In I73a437789c80c5a66a1e0aa594a63ba06ec6dee8 with SHA-1 c951b406 is already in history

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



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