Merge "Fix EthernetTetheringTest failure if tethering is not supported" am: dace79b0ac

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

Change-Id: I53b28c47dcf5c0590c02fc2f8f7c36a8323030d2