Merge "Revert "Revert "Revert "Revert "Add VpnServiceBuilderShim for Vp..."" am: 29116813dd Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1938731 Change-Id: Ifb5471e7b97d23bf058cd81b8fe556235d0b191f