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

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

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