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

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

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