Merge "Fix EthernetTetheringTest failure if tethering is not supported" am: 6ad5decb8f am: f3cf2040b0

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

Change-Id: I6763589a3af8cd78efc53e0637ff4f9d6ebcef88