Small VPN cleanup

Test: FrameworksNetTests
Change-Id: I41c3bf6c20fb01d4342388b5415942d9df991fbd
1 file changed