Merge "Use apfVersionSupported for ApfFilter data region access control" into main am: d10750fe45 am: 57f55b9d98

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

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