[automerger skipped] Merge "Allow non-VPNs to have underlying networks." into sc-dev am: 0868536de9 -s ours

am skip reason: Merged-In I53d6080f48707ff3c37fbfbef534284ba77a7432 with SHA-1 bd079455f1 is already in history

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

Change-Id: I0ec642a8f21b404f9764472088bdddd985b8042f