[automerger skipped] Merge "sdp: Convert leftover APPL_TRACE_ERROR calls" into...

[automerger skipped] Merge "sdp: Convert leftover APPL_TRACE_ERROR calls" into aosp-main-future am: ad0a3092 -s ours am: f9a46709 -s ours

am skip reason: Merged-In I05e94ab746e91116a31f9a369d0593ed78da4a7b with SHA-1 453465d7 is already in history

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



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