[automerger] Merge "Increase the capture timeout to 1500 ms" into nougat-mr1-cts-dev am: 69d80dae am: e94e1dbc Change-Id: Ic22240ae90213f5b2dafb739892ad8136e832635