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

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

Change-Id: I0d7d72aad8c3f10af402111f62f5706c0703514f