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

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

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