Merge "Fix EthernetTetheringTest failure if tethering is not supported" am: 6ad5decb8f am: f3cf2040b0 am: 0875fe5f4f am: 3d2052416f

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

Change-Id: I3ffd9429d36ee79f73a39ffbd86e43b46d0f2a8a