[automerger skipped] Merge "Check network transport instead of meteredness." am: 7164dc8700 am: 4dd9efd754 am: b5f06f9f76 -s ours

am skip reason: skip tag Change-Id Iabab1512933313e89b2c889a77736a75d2bd505f with SHA-1 3e7ff67f10 is already in history

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

Change-Id: I0a668da5a687faf19eac77f80ab4c983aa1e1f5b