Merge "BpfNetworkStats - remove spurious code & use static maps" am: 567b664d90

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

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