[automerger skipped] Merge "Remove Tethering @TestApi" am: bd175573a5 am: b2442b9036 am: bd9245a75e am: 632533c38e -s ours

am skip reason: Change-Id I6e2c8298e90b4b54f0264be974d036fa08cd5632 with SHA-1 cc7e6f62e7 is in history

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

Change-Id: Ie918c3443f454be3b481ed4899baee3c126c71b4