Merge "Fix TetheringTest crash on eng build" am: ff77e99cf0 am: 2d5584fc34

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

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