Merge "[Thread] fix CTS test for Android TV U" into main am: 1c6f6e33de

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

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