Merge "Disable R+ tests on Q" am: f7ab422491 am: 9e4b7447e4 am: 04deef3acf

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

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