Merge "Fix HostsideVpnTest#testExcludedRoutes" am: d42d1645cb am: e21ceb2f19

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

Change-Id: I90f48897c0098be55e3b8f7ab0a9fefad46613ed