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