Merge "Allow any transport with TEST if the network is restricted" am: 7e9223a751 am: a76cc4e98d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702489

Change-Id: I8b42aa698f279774b8d5781811dc848c7d7ff713