[automerger skipped] Merge "Update tethering module api files" am: 7a25ae95c7 am: 1f47f6af86 -s ours am: 0ae7cbb776 -s ours
am skip reason: Change-Id Idd041f0fbeca411ea23e49786a50dd7feb77ef45 with SHA-1 f1332573bb is in history
Change-Id: I691c492be539d8304796300ae4dcfd69f96bfb36
This commit is contained in: