Merge "Only dump ApfFilter if ApfFilter is actually supported" into main am: d0bd2a5654 am: 54bd2f98b7 am: 007194d91f

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

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