Merge "Support APF multi-device test" into main am: f86eaecbcf

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

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