Merge "Set timeout to 6 minutes for CtsOpenGlPerf2TestCases" into pie-cts-dev am: 753274afac
am: 41a0ea7dba

Change-Id: I1be2273c76f1e2a99271e368d4ac8fb1bac79f73