Merge "Skip connectivity unit tests before S" am: ef34fd2e21

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

Change-Id: If2590a469d61cd34b702fb6ca9c57ef026221540