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

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

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