Merge "Update log messages for l2cap and rfcomm sockets with correct id" into main am: d2feac5d

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



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