Merge "Merge "Exclude MediaPlayerFlakyNetworkTest from cts-reference-aosp" into oreo-cts-dev am: 37e625014e  -s ours" into oreo-mr1-cts-dev