Merge pull request #24235 from markdroth/xds_tsan_fix

Fix use-after-free bug

src/core/ext/xds/xds_client.cc

@@ -172,6 +172,7 @@ class XdsClient::ChannelState::AdsCallState
         MutexLock lock(&self->ads_calld_->xds_client()->mu_);
         self->OnTimerLocked(GRPC_ERROR_REF(error));
       }
+      self->ads_calld_.reset();
       self->Unref(DEBUG_LOCATION, "timer");
     }
 
@@ -213,7 +214,6 @@ class XdsClient::ChannelState::AdsCallState
         }
         GRPC_ERROR_UNREF(watcher_error);
       }
-      ads_calld_.reset();
       GRPC_ERROR_UNREF(error);
     }