Merge "Fix EthernetTetheringTest failure if tethering is not supported" am: dace79b0ac am: 8b74fe1c8b am: 218040ca26

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

Change-Id: I861bc25832f8e3ac436e8f0127aa0aed4f64ca8a