Merge "Fix ApfTest and apf_jni to make it match the latest design of ApfV6" into main am: d5e4db5844

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

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