Merge "cts-grahpicsstats: adjust timeout for jank frames." into oreo-cts-dev am: 51b3d84eda am: 3d923dbe97 am: 57077d45dd
am: 50b2321b2a

Change-Id: I43baf004fe542176c0959ad10fafdcac545268a1