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

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

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