Merge "Merge "Increase the capture timeout to 1500 ms" into nougat-mr1-cts-dev am: 69d80dae08" into oreo-cts-dev