Merge "[automerger skipped] Fix CtsTetheringTest on devices without permanent softAp interfaces. am: 3abe36567c am: ef7d1e44ca am: a3331299ce -s ours" into rvc-qpr-dev-plus-aosp am: 7178cff10a -s ours
am skip reason: Change-Id I0ba6bc9dcbf7829dcad5561c707d5f5c5540f10b with SHA-1 3abe36567c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11863001
Change-Id: If7436d22e588264d78480f18312c6475de6b18d8
This commit is contained in: