Merge "Fix HostsideVpnTests flakyness" am: 116bd6e1a2

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

Change-Id: If0a76a38f3e961c45962553804f849da65e2db83