Merge "Skip tests on unsupported devices." am: 0dc6206752 am: f8110a2cda

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

Change-Id: Ib0d27578e15d6f4af77723700ca564ecf15c0f4e