Merge changes from topic "gfxstream-end2end-tests" into main am: 2455c0a977

Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/2670116

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