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

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

Change-Id: I8f1d639243617f21ab220685108adab2a3e8d3a3