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

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

Change-Id: I008257f54d5afc0b740ac03989a45d8ce97e13c9