Merge "Increase timeout for testDeselectTrackForSubtitleTracks" into nougat-mr1-cts-dev am: 09a67515dd am: a0da24ab51
am: bcb2a85fd5

Change-Id: Ic9d2943a065b478b3e2249257ce0d5cb0e62c44b