[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/platform/tracing_agent/atrace_tracing_agent.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from systrace.tracing_agents import atrace_agent
 from telemetry.internal.platform import tracing_agent
 from telemetry.timeline import trace_data
 
 from devil.android.sdk import version_codes
 
@@ skipping 37 matching lines @@
       return False
     self._categories = config.atrace_config.categories
     self._options = AtraceOpts(str(self._device), config.atrace_config.app_name)
     return self._atrace_agent.StartAgentTracing(
         self._options, self._categories, timeout)
 
   def StopAgentTracing(self):
     self._atrace_agent.StopAgentTracing()
 
   def SupportsExplicitClockSync(self):
-    # TODO(alexandermont): After bug
-    # https://github.com/catapult-project/catapult/issues/2356 is fixed, change
-    # this to return self._atrace_agent.SupportsExplicitClockSync.
-    return False
+    return self._atrace_agent.SupportsExplicitClockSync()
 
   def RecordClockSyncMarker(self, sync_id,
                             record_controller_clock_sync_marker_callback):
     return self._atrace_agent.RecordClockSyncMarker(sync_id,
         lambda t, sid: record_controller_clock_sync_marker_callback(sid, t))
 
   def CollectAgentTraceData(self, trace_data_builder, timeout=None):
     raw_data = self._atrace_agent.GetResults(timeout).raw_data
     trace_data_builder.SetTraceFor(trace_data.ATRACE_PART, raw_data)