Merge "Use assumeTrue in VpnTest"