Merge "Add txBytes and rxBytes to RecordUpstreamEvent" into main am: a90e703565 am: 3173bbd306

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

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