[automerger skipped] Merge "bt_trace: Convert conflicting bt_trace log...

[automerger skipped] Merge "bt_trace: Convert conflicting bt_trace log instances to LOG_xx" into main am: f42ac9cb am: 250ca3e9 -s ours am: 0058c023 -s ours

am skip reason: Merged-In If7752f6edd749d6d5a4bb957b4824c22b5602737 with SHA-1 5d1a3feb is already in history

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



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