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

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

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