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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1121324

Change-Id: I0d8018b400b578ff6aed9da6e44da8f3f75b6ab0