Merge "Merge "Test: CameraCTSTest-Extend camera test timeout from 60min to 200min." into oreo-cts-dev am: 0d1747978d"