Refactor ApfV4Test am: cf655869ba

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

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