Merge "Revert "Revert "Revert "Add VpnServiceBuilderShim for VpnService..."" am: 7178c3dc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1941193 Change-Id: I96d74e3124a91c101a63832561bd03e84b49cfa4
Loading