Merge "Allow non-VPNs to have underlying networks." into sc-dev am: 0868536de9

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

Change-Id: I6f9895eee27be8f6b179270f15a0bdf56baf47bd