Merge "Update log messages for l2cap and rfcomm sockets with correct id" into...

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

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



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