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

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

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