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

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

Change-Id: Ied6f3c44b899f23eb9544d2d98b14ce0c1fd2dbf