Merge "Dump underlying BPF traffic stats as well as higher-level stats." am: a79b785ff0

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

Change-Id: I48e40cda3974f9923ab9045d899033293e52d42c