[automerger skipped] Merge "system/stack/smp: Conflict resolution for...

[automerger skipped] Merge "system/stack/smp: Conflict resolution for libbluetooth_log migration" into main am: c2a7f599 am: 0b241f02 -s ours

am skip reason: Merged-In I4ca5347484639e2d7a499f4a0b7ab7de6d0cee63 with SHA-1 c4686e35 is already in history

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



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