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

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

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

Change-Id: I3c03bc3f9c1c16f27af9c7fce1629f383c2f338d