Merge "Correctly dump IPv4 downstream flows." am: a8afcd3b0e am: 18e6921d00 am: 6f3e90c2e5

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

Change-Id: I3d3ea4733689c2421fa9e2727bdd41f41fcb54e6