Merge "Add visibility for Connectivity tests" am: bc87949c28 am: 52caed91c9 am: 5e2533aadd

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1730122

Change-Id: I3906d6a5f1bf79a3144e477f562f9aa41b13ab90