tree 5c10b4cb55c0627d5753651f688c737bd2420628
parent da7f313fb43636c64db9b3a54f1c90ee8fb3a3f8
parent 5903d5646c1cf607a2b18400666f30b699da05fc
author Treehugger Robot <treehugger-gerrit@google.com> 1625233101 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625233101 +0000

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

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

Change-Id: Ie6894fc292e5d6ef7f084abcf3ddbdfdd7540648