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

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

Change-Id: I571d7de197af2c8d68edebcda07201f9bb1158d5