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

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

Change-Id: Ia8a3e76035d1607249fe0661951e127b90ae3ce2