[automerger skipped] Merge "TetheringManager API clean up" am: c686fa82 am:...
[automerger skipped] Merge "TetheringManager API clean up" am: c686fa82 am: 06ef41cf -s ours am: 9bf3bb0c -s ours
am skip reason: Change-Id Idd041f0fbeca411ea23e49786a50dd7feb77ef45 with SHA-1 62a625df is in history
Change-Id: I40790dddee5558670b9e83a5be0c5b5d0d38b2d0