Merge "metricsd: Persist metrics on shutdown." am: 195bbc718b
am: 4101ba7bbc

* commit '4101ba7bbc2989d95d0361c341a268b54e6eac23':
  metricsd: Persist metrics on shutdown.