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

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

Change-Id: If26c0f68ed30df42ff8f78a5d83b6961db32d703