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

* commit '195bbc718be30c025a512ad6e1f7eae866ae67cd':
  metricsd: Persist metrics on shutdown.
diff --git a/metricsd/uploader/upload_service.cc b/metricsd/uploader/upload_service.cc
index ab44b28..0dc59a4 100644
--- a/metricsd/uploader/upload_service.cc
+++ b/metricsd/uploader/upload_service.cc
@@ -90,6 +90,7 @@
 
 void UploadService::OnShutdown(int* exit_code) {
   metricsd_service_runner_.Stop();
+  PersistToDisk();
 }
 
 void UploadService::InitForTest(SystemProfileSetter* setter) {