Merge "simplify tcpTx/RxPackets" into main am: b4870c4ce2

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

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