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

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

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



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