Merge "TetheringManager API clean up" am: 9bfe7f7b3e

Change-Id: I93e9bb5f596fff27de236b56cf21f9edb3c0204a