Merge "patch up a bit of reporting metric logic" into main am: 0f09916d am: 4c9ae250

Original change: https://android-review.googlesource.com/c/platform/build/+/3420199



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