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

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

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