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