Merge "Merge cherrypicks of ['android-review.googlesource.com/3757307'] into androidx-benchmark-release." into androidx-benchmark-release