[automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: e6317e5caa am: 241609e5d2 -s ours

am skip reason: Change-Id I2b9be6799c6edeefc8cd74897a8704dbe80dd061 with SHA-1 e2d85f644a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12137906

Change-Id: I05505eaaefe7d638a1208e23994c41617ceba60b