Merge "Add @VsrTest annotations to ApfIntegrationTest" into main am: eb6c2885a3

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

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