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

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

Change-Id: I1f2a4d032b091f08b05308d295fe7f7e8b434e15