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

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

Change-Id: Ib8ee3109ba5525ce1b1c6c2bd5ebcdc0b48a5319