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

Change-Id: I71c6e8d5658ac9bf4a05d8882dad40ba232cd0d4