[automerger skipped] Merge "TetheringManager API clean up" am: ffe3a0c6ca am: 20df994471 -s ours
am skip reason: Change-Id Idd041f0fbeca411ea23e49786a50dd7feb77ef45 with SHA-1 68b6784942 is in history
Change-Id: I3b914d7ea26dacf4e7cbebd0494d4c4c0b520c8c
This commit is contained in: