Merge "Update Socket API to get L2CAP channel ID through native stack" into main am: 1256b3fa

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



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