Merge "[Thread] add integration tests for aosp/3334156" into main