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

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

Change-Id: Iaaba0a24cdd132b0f78d340148e83d80db8dbb02