Merge "Update MetricsTimeZoneDetectorStateTest"