Merge "[automerger skipped] Merge "AM: make isHighEndGfx TestApi" into android10-tests-dev am: a59e2cd3c4 -s ours" into android11-tests-dev