[automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: e6317e5caa -s ours am: 40f9b161e8 -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: I7295de91e3261861fef8bace9cf3e345197e43ee