Merge "Only dump ApfFilter if ApfFilter is actually supported" into main am: d0bd2a5654 am: 253d6001dc

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

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