Merge "Snap for 7241009 from 8e8dae73d8851e7c7523493c6c8f68133a1a5fd4 to androidx-benchmark-release" into androidx-benchmark-release