Merge "[Thread] fix ServiceDiscoveryTest" into main am: 0a52da9f08

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

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