Merge "Re-skip connectivity unit tests before S" am: a9230c1bf7 am: 1f3d8dc5e8

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

Change-Id: I5ce3c5b7dc333c802890831daf8289985c61301d