[automerger skipped] Merge "TetheringManager API clean up" am: 9bfe7f7b3e am: 62be3f6a96 -s ours

am skip reason: Change-Id Idd041f0fbeca411ea23e49786a50dd7feb77ef45 with SHA-1 f1332573bb is in history

Change-Id: I3b914d7ea26dacf4e7cbebd0494d4c4c0b520c8c
tree: 6012af7317496efe769595ce11938c2e3992b65b
  1. Tethering/