Merge "Use BpfDump#dumpMap in NetworkStatsService dump" am: ec94e62460

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

Change-Id: Icf875e30b19445497c656789c72b5f5db2387e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>