Merge "Fix CTS test failed on R device" am: afa18f0256 am: 0919cc06c5 am: d517fa33a0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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