Merge "Ignore testRestrictedNetworkPermission on Q" am: 6b6d2eb75b am: ccb213843c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826056

Change-Id: I57bd2a913cc23370ad064054b41cb29c68b80d46