Merge "metricsd: Fix CumulativeUseTime metrics."