Merge "[automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: 0275981699 -s ours am: c72e3873b2 -s ours am: 99c50241f3 -s ours" into rvc-qpr-dev-plus-aosp am: f8df6534c9 -s ours

am skip reason: Change-Id I2b9be6799c6edeefc8cd74897a8704dbe80dd061 with SHA-1 0275981699 is in history

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

Change-Id: Iecfde7015fb67a4066697e95b80d70c71a09d177
tree: 8523d8b5f4fb2c567ed12fffacca72cbd3813692
  1. Tethering/