[automerger skipped] Fix tethering unit test fail in R am: 6cee9c5e04 am: 2aa768a7e9 -s ours

am skip reason: Merged-In I4eb4b757f6d7cd3458964c81310dcf0687a4f091 with SHA-1 9eac605333 is already in history

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

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