Merge "Ignore testRestrictedNetworkPermission on Q" am: 6b6d2eb75b am: ccb213843c am: d4c5e13ebe am: bc29f21cfd am: 48723f3ced

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

Change-Id: I56665a5aed1905128d011ad8d02ef9be33c73f0b