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

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

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