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

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

Change-Id: I7103a24074d110ed0c935653ac2f76ea4e92cae8