Merge "Revert "Revert "Revert "Revert "Add VpnServiceBuilderShim for Vp...""