Merge "Only dump ApfFilter if ApfFilter is actually supported" into main am: d0bd2a5654 am: 59f805dad2

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

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