Merge "Default enable ApfFilter for all devices < V" into main am: dc1635b54d am: 4d9125f068

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

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