[automerger skipped] Merge "Remove Tethering @TestApi" into mainline-prod am: eccc277066 -s ours
am skip reason: Change-Id I6e2c8298e90b4b54f0264be974d036fa08cd5632 with SHA-1 44b2ebcf34 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12836355
Change-Id: I1431227440105d36d6f6f79e6fadad84bad518d0
This commit is contained in: