Merge "Update ApfIntegrationTest to use new ApfV4Generator constructor" into main am: 81837d0766 am: 3ef82fb0a6

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

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