Improve odrefresh metrics collection. am: 1be593c9fc am: 37881c196b am: 81a4061957

Original change: https://android-review.googlesource.com/c/platform/art/+/2223024

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