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

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

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