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