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