Merge "[Thread] remove Thread.sleep from CTS tests" into main am: 60a36b3163 am: ac855cf67a

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

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