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

Change-Id: I539bd91fb7bcec8e91783b8dff0a1c1f20c79a52