[automerger skipped] Merge "system: Convert leftover BTM_TRACE_ERROR calls"...

[automerger skipped] Merge "system: Convert leftover BTM_TRACE_ERROR calls" into aosp-main-future am: ca24ac6b -s ours am: 343cab67 -s ours

am skip reason: Merged-In I05e94ab746e91116a31f9a369d0593ed78da4a7b with SHA-1 4d49dffa is already in history

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



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