Merge changes from topic "am-958173d3061b42e88a7a39f6b5d071c5" into android12-tests-dev

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