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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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