Merge "Fix CtsTetheringTest on devices without permanent softAp interfaces." am: 10f23078c1

Original change: https://android-review.googlesource.com/c/platform/cts/+/1331096

Change-Id: I77c08e18837bd0d04744c4dd5b058c368e90f85d