Merge "storaged: Avoid divide-by-zero in performance measurement" into tm-dev am: 190e2bc6e1

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/18620177

Change-Id: I4489ef2286a2bb197056a0eb922a75ac3e4eadbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/storaged/storaged.cpp b/storaged/storaged.cpp
index 8cc8b59..cefef6e 100644
--- a/storaged/storaged.cpp
+++ b/storaged/storaged.cpp
@@ -333,7 +333,7 @@
             first_write = false;
         }
 
-        if (benchmark_size) {
+        if (benchmark_size && benchmark_time_ns) {
             int perf = benchmark_size * 1000000LLU / benchmark_time_ns;
             storage_info->update_perf_history(perf, system_clock::now());
         }