Fixed timezone sensitivity in the test
Merge remote-tracking branch 'origin/SPARK-3173' into SPARK-3173

Conflicts:
	sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
Fixed test merge conflict