Merge "Disable R+ tests on Q" am: f7ab422491 am: bd938fb154

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

Change-Id: I2627f352ad2d18756b937a7f2e70fc358967a95a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>