[automerger skipped] Merge Android 12 am: 2b5d69ceda -s ours am: 1a31160b9f -s ours am: 294876dda0 -s ours am: 0b2e595206 -s ours am: bcbcbd1183 -s ours

am skip reason: Merged-In I5568b4b0f638f29fece4a234202625fcc73adba9 with SHA-1 0078b07c74 is already in history

Original change: https://android-review.googlesource.com/c/platform/tools/test/graphicsbenchmark/+/1847927

Change-Id: I07128323fb5563b6d406db00f98829cbc79669ef