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

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

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