Merge branch 'upstream-v1.5.5' of https://android.googlesource.com/platform/external/google-benchmark into androidx-main Change-Id: I952241ca6bd512eedb106f2966aa29249b559e63