Merge "Set timeout to 6 minutes for CtsOpenGlPerf2TestCases" into pie-cts-dev