Merge "Fix TetheringTest crash on eng build" into sc-dev am: f15137fb9f

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

Change-Id: I8cd2c8a60e72f28aaf3b931ad7701263d8fd9b29