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

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

Change-Id: I1ea60c7a40926c8a3a6b9df05592c18ef9421280