Merge "Fix HostsideVpnTest#testExcludedRoutes" am: d42d1645cb

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

Change-Id: I0c866d08d1dbd24b8466593e40ae29805167004f