Merge "Revert "Revert "Revert "Add VpnServiceBuilderShim for VpnService...""