Merge "Skip CaptivePortalTest for wearables" am: 3a1a22b82a

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

Change-Id: Iaca1c0ae1db503c0f025af737cc83ce60f4ab7e2