Merge "Check network transport instead of meteredness." am: 7164dc8700 am: 4dd9efd754

Original change: https://android-review.googlesource.com/c/platform/cts/+/1661218

Change-Id: Ie826341e62b6095bb8703401de122744b5e56be9