Merge "Support testing upload/download packets" am: 139f43509e am: 911bd90d33

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

Change-Id: Ic70913ef89cf1474a7dcf68636312521a99a845b