Merge "Revert "Skip connectivity unit tests before S"" am: b0c9e64d33 am: af5ae307f2

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

Change-Id: Ibacbb3f4ca829931b723893a1dd84a2d21de914e