Merge "Revert^2 "Refactor ApfFilter constructor"" into main am: c64433c6cd am: 150192a006 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/3170139 Change-Id: I880b6bcec9004ad62e4b970f6f6cc519d15bd7d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>