[automerger skipped] Merge changes from topic "no-platform-app-glue" am: 5c465fff5e am: 9eb54ab3f7 -s ours am: d863d0c284 -s ours am: 7cf4cd28f8 -s ours am: 20f360bac6 -s ours

am skip reason: Change-Id I5f3d9b27dc3911af6d96b77afd4aacef305f93f1 with SHA-1 f1b60ffc99 is in history

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

Change-Id: I891d4301001aab36371756a21ad34835560bf5da