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

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