Merge "Add netId in TcpSocketTracker logs" into main am: 9c1dc60c69

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

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