Merge "Remove Tethering @TestApi" am: bd175573a5 am: 67f88535d1 am: 96a954a8d6

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

Change-Id: I53a8acb3de1550281a6feb15ebfb07c73cef072c
tree: 4eab85dfd3b329e7514facc80473abba2c915735
  1. Tethering/