Merge "Skip multi-device tests instead of abort if device is non-B+ devices" into main am: c049f61372

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

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