Revert of telemetry: Clean up SurfaceFlinger statistics

tools/telemetry/telemetry/timeline/model.py

Index: tools/telemetry/telemetry/timeline/model.py
diff --git a/tools/telemetry/telemetry/timeline/model.py b/tools/telemetry/telemetry/timeline/model.py
index 3fc1b8a16df544d98ba28aeea4b413c6173e2f98..13dc1cfcfbb3bd839c8976590a5e2977ddf580a9 100644
--- a/tools/telemetry/telemetry/timeline/model.py
+++ b/tools/telemetry/telemetry/timeline/model.py
@@ -16,7 +16,6 @@
 from telemetry.timeline import empty_timeline_data_importer
 from telemetry.timeline import event_container
 from telemetry.timeline import inspector_importer
-from telemetry.timeline import surface_flinger_importer
 from telemetry.timeline import trace_event_importer
 
 # Register importers for data
@@ -24,8 +23,7 @@
 _IMPORTERS = [
     empty_timeline_data_importer.EmptyTimelineDataImporter,
     inspector_importer.InspectorTimelineImporter,
-    trace_event_importer.TraceEventTimelineImporter,
-    surface_flinger_importer.SurfaceFlingerTimelineImporter
+    trace_event_importer.TraceEventTimelineImporter
 ]
 
 
@@ -59,7 +57,6 @@
     self._thread_time_bounds = {}
     self._processes = {}
     self._browser_process = None
-    self._surface_flinger_process = None
     self._frozen = False
     self._tab_ids_to_renderer_threads_map = {}
     self.import_errors = []
@@ -98,16 +95,6 @@
   #pylint: disable=E0202
   def browser_process(self, browser_process):
     self._browser_process = browser_process
-
-  @property
-  #pylint: disable=E0202
-  def surface_flinger_process(self):
-    return self._surface_flinger_process
-
-  @surface_flinger_process.setter
-  #pylint: disable=E0202
-  def surface_flinger_process(self, surface_flinger_process):
-    self._surface_flinger_process = surface_flinger_process
 
   def AddMappingFromTabIdToRendererThread(self, tab_id, renderer_thread):
     if self._frozen: