Merge "Merge "AM: make isHighEndGfx TestApi" into qt-dev am: 2ac934280c am: 1b027edda1" into qt-r1-dev-plus-aosp
am: 04824c59f4

Change-Id: I291f1704bbc760e786da6f90f9681d79a9cd7915