[automerger skipped] Merge "storaged: Avoid divide-by-zero in performance measurement" into tm-dev am: 190e2bc6 -s ours am: 0706fc26 -s ours

am skip reason: Merged-In Idec0052f534dc4abb81a414ca76f6c11f4a4dded with SHA-1 5a02a9ba is already in history

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



Change-Id: I121535ea01311e93f6ab62c54730e645e564277f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>