Merge "Improve dumping IPv4 map entries." am: 26f799f2d7 am: 7bd9af79a7 am: 21a62c5bcb

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

Change-Id: I225cc3c26e3142f648846259f7e5d4e273f24468