[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 0078b07c74 -s ours

am skip reason: Merged-In Ieb2ff68a926bc419ede65746c8df89ff05048edb with SHA-1 e1a227c750 is already in history

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

Change-Id: Idb5ca4764586af31447096459d9da77bf8d85de2