[automerger skipped] Merge "Fix TetheringTest crash on eng build" into sc-dev am: f15137fb9f -s ours
am skip reason: Merged-In I61f6088783d521fd17ae1e87370842b4239fbe75 with SHA-1 7ba566dbf7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14637501
Change-Id: Ia40558871b1ea9ea4ae8ca23501f407c3046589e
This commit is contained in: