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

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

Change-Id: Ide15a934f8df06800815d61738d2ee3ac0741264