Improve testSetNextMediaPlayer test

This catches some issues observed on devices in the field.
b/7952350
b/7950253

Change-Id: Ifa77d2001427e58e5339a2c223c3fedf60be847d
2 files changed