Merge "Fix HostsideVpnTests flakyness" am: 116bd6e1a2 am: cb60692e1f am: b64c2e0a45

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

Change-Id: I708205f9454307839e2d153cf0583ee8ea2f4aa1