[automerger skipped] Merge Android U (ab/10368041) am: df174a78d0 -s ours am: d1798cb71e -s ours am: 26c1cca2af -s ours

am skip reason: Merged-In Iefab35cff172f4afcbeb81f0f1bde77f0be3af5f with SHA-1 e179dffb2d is already in history

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

Change-Id: Ie7763bee2e4c350ed039c10ca47042cd90f4f1b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>