[sanity] fix sanity on master (#36102)

Broken by the merge commit for https://github.com/grpc/grpc/pull/36021.

Closes #36102

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36102 from markdroth:sanity 709aa26fe8
PiperOrigin-RevId: 615200273

src/core/ext/xds/xds_bootstrap_grpc.cc

@@ -14,10 +14,10 @@
 // limitations under the License.
 //
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/ext/xds/xds_bootstrap_grpc.h"
 
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
 #include <stdlib.h>
 
 #include <algorithm>
@@ -26,13 +26,6 @@
 #include <utility>
 #include <vector>
 
-#include "src/core/lib/config/core_configuration.h"
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/json/json.h"
-#include "src/core/lib/json/json_object_loader.h"
-#include "src/core/lib/json/json_reader.h"
-#include "src/core/lib/json/json_writer.h"
-#include "src/core/lib/security/credentials/channel_creds_registry.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
@@ -42,6 +35,16 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
+#include <grpc/support/json.h>
+
+#include "src/core/lib/config/core_configuration.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/json/json.h"
+#include "src/core/lib/json/json_object_loader.h"
+#include "src/core/lib/json/json_reader.h"
+#include "src/core/lib/json/json_writer.h"
+#include "src/core/lib/security/credentials/channel_creds_registry.h"
+
 namespace grpc_core {
 
 //

test/core/xds/xds_client_test.cc

@@ -20,12 +20,6 @@
 
 #include "src/core/ext/xds/xds_client.h"
 
-#include <google/protobuf/any.pb.h>
-#include <google/protobuf/struct.pb.h>
-#include <grpc/grpc.h>
-#include <grpc/support/json.h>
-#include <grpc/support/log.h>
-#include <grpcpp/impl/codegen/config_protobuf.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ -35,8 +29,22 @@
 #include <string>
 #include <vector>
 
+#include <google/protobuf/any.pb.h>
+#include <google/protobuf/struct.pb.h>
+
+#include "absl/strings/str_cat.h"
+#include "absl/time/time.h"
+#include "absl/types/optional.h"
+#include "absl/types/variant.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "upb/reflection/def.h"
+
+#include <grpc/grpc.h>
+#include <grpc/support/json.h>
+#include <grpc/support/log.h>
+#include <grpcpp/impl/codegen/config_protobuf.h>
+
 #include "src/core/ext/xds/xds_bootstrap.h"
 #include "src/core/ext/xds/xds_resource_type_impl.h"
 #include "src/core/lib/event_engine/default_event_engine.h"
@@ -52,11 +60,6 @@
 #include "test/core/util/scoped_env_var.h"
 #include "test/core/util/test_config.h"
 #include "test/core/xds/xds_transport_fake.h"
-#include "absl/strings/str_cat.h"
-#include "absl/time/time.h"
-#include "absl/types/optional.h"
-#include "absl/types/variant.h"
-#include "upb/reflection/def.h"
 
 // IWYU pragma: no_include <google/protobuf/message.h>
 // IWYU pragma: no_include <google/protobuf/stubs/status.h>