Merge "Fix HostsideVpnTests flakyness" am: 116bd6e1a2 am: 354c3bdad5

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

Change-Id: I43b46151b0f80ae40199e5862b8998d195c512d0