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

* commit '195bbc718be30c025a512ad6e1f7eae866ae67cd':
  metricsd: Persist metrics on shutdown.