Merge "Remove Tethering @TestApi" am: bd175573a5 am: b2442b9036 am: bd9245a75e

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

Change-Id: I53a8acb3de1550281a6feb15ebfb07c73cef072c