Merge "Enhance APF logging with counter dumps and recent program updates" into main am: 515d4d4b15 am: 25e2eaeff2 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/3109799 Change-Id: I2b53f25565c1bc3b5dde80f08fe93ed7dff54e17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>