Merge "cts-grahpicsstats: adjust timeout for jank frames." into oreo-cts-dev