Merge "Fix HostsideVpnTest#testExcludedRoutes" am: d42d1645cb

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1968680

Change-Id: I603441cb08aa24f054e3d931ccd836a51e27f364