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

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

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