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