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

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