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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I856c51aa30da6d9e5097aee2a65fb99f8c6fb8aa
tree: 5223657917bf4940cb2d86711e5730b41be3f46f
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING