Merge "Improve dumping IPv4 map entries." am: 26f799f2d7

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

Change-Id: I9689a3ef866b2d4fd246663bd0909082b86a4624