Merge "Fix HostsideVpnTest#testExcludedRoutes" am: d42d1645cb am: 7923399de3

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

Change-Id: Id636b5b3ae7d2a5141cbe2a4b61fdc1fbbb1e4ae