Merge "Fix android.media.cts.MediaPlayerFlakyNetworkTest failure" into qt-dev
am: e0092766d2

Change-Id: I45c15fecc674eb2e73afd1a3f02cd6f8f496c946