Merge "Fix EthernetTetheringTest failure if tethering is not supported"