Merge "Update ApfIntegrationTest for APFv6/v6.1 requirements" into main am: a03654ad70

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

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