Merge "[Thread] fix CTS test for Android TV U" into main