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

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

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