Merge "Add tx_bytes and rx_bytes to UpstreamEvent message" am: 0f8a7aaede am: dd41476d8e

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

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