Merge changes I299dd0df,If4a256df into main

* changes:
  Re-enable HostsideVpnTests on presubmit
  Update VpnTest#testDefault to use otherUid that has internet permission