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

Change-Id: I27b85093c3f4a4cc3ff89b28901d201e1e165413