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

Change-Id: I070363f74f3364e2537fd955ed6610a17cd738a3