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: I35fd8f44391449b2f5888a8d0c2c822e7f495cfc