[automerger skipped] Merge "Change tethering file structure to respect its package name" am: c31e88ace6 am: 9fce5bc8b9 -s ours am: 1cfb5e6365 am: db0698b0a0

Change-Id: I573b350831f620a4a570c402f99e0943c735d35a
tree: 23b543517ec56bf74d69e24cee24eb562933143c
  1. Tethering/