Android R Beta 2
Merge changes from topic "no-platform-app-glue" am: 5c465fff5e

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

Change-Id: Ifc59b3559529fe64014ba9015348169e54b4444f