Merge "Test ConnectivityManager module-lib APIs for VPNs and blocking." am: f6875cc583

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

Change-Id: I4d3f3c905fde3e9da08df5c3efa203fe570a2407