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

Change-Id: I54bd68ce604bbfba7fa9bc456b1f866ffb84df28