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

* commit '473604c1c2b4e08f2fd904dea08f40c26d6f8604':
  metricsd: Fix CumulativeUseTime metrics.