Merge "Skip CaptivePortalTest for wearables" am: 3a1a22b82a am: b931a1f392

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

Change-Id: I2c067606a2f40baf9438c203b810b47f057b2350