Merge "Merge "Test: CameraCTSTest-Extend camera test timeout from 40min to 60min." into nougat-mr1-cts-dev am: 478c78fa27"