Merge "Allow non-VPNs to have underlying networks." am: 5903d5646c am: 9a7c9c3c06

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

Change-Id: Ia7a8fa678358e6bec48d193fd390d0bd2465c74e