Merge changes from topic "hostsidevpntestflaky" into main am: a6be6cd48a am: 235bb02553

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

Change-Id: Ic91b7b23cd3dadea1190cba0df7a33ebad730c5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>