[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: 1fe8115f am: 6d4e9e14 -s ours am: 31c5c9d0 -s ours

am skip reason: Merged-In I82ca961e2f5bea73f00e37cbad401666253dfee9 with SHA-1 a89c2db1 is already in history

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



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