Merge "Fix CTS test failed on R device" am: 75d28bee27 am: 3ec8882370 am: 0937250278

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie091b95fd2dc27f2cd03aa45e316fc5f8af0188b
tree: 80812865b3032c8cd136be6c1acb11e5d1c6d34b
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING