Merge "system/stack/smp: Conflict resolution for libbluetooth_log migration"...

Merge "system/stack/smp: Conflict resolution for libbluetooth_log migration" into main am: c2a7f599

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



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