Merge "system/bta/le_audio: Conflict resolution for libbluetooth_log...

Merge "system/bta/le_audio: Conflict resolution for libbluetooth_log migration" into main am: 8c1a26ea

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



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