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

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

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