am ccdd012f: Merge "metricsd: Fix CumulativeUseTime metrics."

* commit 'ccdd012ff360e8a04055cdb9dbead282cca839d3':
  metricsd: Fix CumulativeUseTime metrics.