Merge "Fix HostsideVpnTests flakyness" am: 116bd6e1a2

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

Change-Id: Ib21c9ef7caec66a50492214a975c901ac26f603b