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

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

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