am 7ad4171f: am dd11d286: Merge "metricsd: Persist the report to disk if an upload fails."

* commit '7ad4171f3ca8654e65016119fe9b37749f80f535':
  metricsd: Persist the report to disk if an upload fails.