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

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

Change-Id: I6d44cc10ae75426e715c95540f64e788b506f83b