Merge "Fix duplicate presubmit entries in thread/TEST_MAPPING" into main