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

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

Change-Id: Ibb26230ad003c82134f586435f135e862de6dd74