Merge "Merge "Unselect track to not affect next selected track" into nougat-cts-dev am: 5792aa3ee3" into nougat-mr1-cts-dev
am: 5b7f224d12

Change-Id: I561529642c152ae716906f8f8a92b1baec678d1e