Revert unwanted changes

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/resolver/TimezoneAwareExpressionResolver.scala

@@ -17,7 +17,12 @@
 
 package org.apache.spark.sql.catalyst.analysis.resolver
 
-import org.apache.spark.sql.catalyst.expressions.{Cast, DefaultStringProducingExpression, Expression, TimeZoneAwareExpression}
+import org.apache.spark.sql.catalyst.expressions.{
+  Cast,
+  DefaultStringProducingExpression,
+  Expression,
+  TimeZoneAwareExpression
+}
 import org.apache.spark.sql.types.StringType
 
 /**

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CastSuiteBase.scala

@@ -21,6 +21,7 @@ import java.sql.{Date, Timestamp}
 import java.time.{Duration, LocalDate, LocalDateTime, LocalTime, Period}
 import java.time.temporal.ChronoUnit
 import java.util.{Calendar, Locale, TimeZone}
+
 import org.apache.spark.{SparkFunSuite, SparkIllegalArgumentException}
 import org.apache.spark.sql.Row
 import org.apache.spark.sql.catalyst.InternalRow