[automerger skipped] Merge "StagefrightTest unselectTrack exception handling" into oreo-cts-dev am: 8778b14377 -s ours am: 1f36791959 -s ours am: ca7ae3f259 -s ours am: 91d0ef5981 -s ours am: 51edd7cf01 -s ours am: fc056f43ba -s ours

am skip reason: Change-Id I85b3f515585f0a5f97c2c874e8735f988fd17e6f with SHA-1 575a167a45 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1449816

Change-Id: I1869a0e68ba722b69a04efdc2b536665f9a9aceb