[automerger skipped] Merge "Remove Tethering @TestApi" am: bd175573a5 am: 67f88535d1 am: 96a954a8d6 am: f3b20fff0e -s ours
am skip reason: Change-Id I6e2c8298e90b4b54f0264be974d036fa08cd5632 with SHA-1 f8f8967d0e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460522
Change-Id: Ie918c3443f454be3b481ed4899baee3c126c71b4
This commit is contained in: